From 1f03516f5a6e133e207279bca0f3cadfda7778f3 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 10 Nov 2011 20:20:28 +0100 Subject: [PATCH] [i18n] Updated Spanish and Galician translations --- ganttzk/src/main/resources/i18n/es.po | 86 +- ganttzk/src/main/resources/i18n/gl.po | 88 +- .../src/main/resources/i18n/es.po | 4534 +++++++++-------- .../src/main/resources/i18n/gl.po | 4531 ++++++++-------- 4 files changed, 5020 insertions(+), 4219 deletions(-) diff --git a/ganttzk/src/main/resources/i18n/es.po b/ganttzk/src/main/resources/i18n/es.po index 8a40f06b1..afffe548f 100644 --- a/ganttzk/src/main/resources/i18n/es.po +++ b/ganttzk/src/main/resources/i18n/es.po @@ -1,5 +1,5 @@ -# Spanish translations for LibrePlan package -# Traducciones al español para el paquete LibrePlan. +# Spanish translations for LibrePlan - GanttZK module +# Traducciones al español para LibrePlan - módulo GanttZK # Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e # Desenvolvemento Tecnolóxico de Galicia # Copyright (C) 2010-2011 Igalia, S.L. @@ -10,11 +10,11 @@ # msgid "" msgstr "" -"Project-Id-Version: 1.1.0\n" +"Project-Id-Version: 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-09 16:17+0200\n" -"PO-Revision-Date: 2011-08-09 16:29+0200\n" -"Last-Translator: Manuel Rego Casasnovas \n" +"POT-Creation-Date: 2011-11-10 20:11+0100\n" +"PO-Revision-Date: 2011-11-10 20:18+0100\n" +"Last-Translator: Manuel Rego Casasnovas \n" "Language-Team: Spanish <>\n" "Language: es\n" "MIME-Version: 1.0\n" @@ -27,7 +27,7 @@ msgstr "" msgid "Erase" msgstr "Borrar" -#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:319 +#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:299 msgid "Add Dependency" msgstr "Añadir dependencia" @@ -39,20 +39,20 @@ msgstr "Trabajador" msgid "Start" msgstr "Inicio" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:592 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:629 msgid "Show reported hours" msgstr "Mostrar horas reportadas" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:92 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:90 msgid "by criteria" msgstr "por criterios" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:72 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:85 msgid "Show/Hide reported hours" msgstr "Mostrar/Ocultar horas reportardas" #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35 -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:46 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:49 msgid "Zoom" msgstr "Zoom" @@ -60,7 +60,7 @@ msgstr "Zoom" msgid "Limiting resources" msgstr "Recursos limitantes" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:68 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:67 msgid "The specified dependency is not allowed" msgstr "La dependencia especificada no está permitida" @@ -68,15 +68,15 @@ msgstr "La dependencia especificada no está permitida" msgid "Set End-End" msgstr "Definir Fin-Fin" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:80 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:78 msgid "Show/Hide progress" msgstr "Mostrar/Ocultar progreso" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:188 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:199 msgid "available effort: {0}, assigned effort: {1}" msgstr "esfuerzo disponible: {0}, esfuerzo asignado: {1}" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:91 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:89 msgid "by resources" msgstr "por recursos" @@ -88,7 +88,7 @@ msgstr "Tarea" msgid "Criterion" msgstr "Criterio" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:41 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:44 msgid "Print" msgstr "Imprimir" @@ -96,7 +96,7 @@ msgstr "Imprimir" msgid "Week" msgstr "Semana" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:489 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:501 msgid "filtering by name" msgstr "filtrando por nombre" @@ -108,10 +108,6 @@ msgstr "Ver planificación" msgid "End" msgstr "Fin" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:37 -msgid "Choosing Template" -msgstr "Selección de plantilla" - #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:243 msgid "changing zoom" msgstr "cambiando zoom" @@ -124,7 +120,7 @@ msgstr "Trimestre" msgid "None" msgstr "Ninguno" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:69 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:71 msgid "Flatten/Unflatten tree" msgstr "Aplanar/Expandir árbol" @@ -136,7 +132,7 @@ msgstr "Filtro" msgid "Project" msgstr "Proyecto" -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:68 +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:67 #: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:28 msgid "Name" msgstr "Nombre" @@ -145,27 +141,23 @@ msgstr "Nombre" msgid "Name filter" msgstr "Filtro por nombres" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:572 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:609 msgid "Show progress" msgstr "Mostrar progreso" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:66 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:67 msgid "Expand/Collapse all" msgstr "Expandir/Plegar todo" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:56 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:58 msgid "Show/Hide critical path" msgstr "Mostrar/Ocultar camino crítico" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:36 -msgid "Create Project" -msgstr "Crear proyecto" - #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:32 msgid "Year" msgstr "Año" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:145 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:150 msgid "showing criteria" msgstr "mostrando criterios" @@ -173,7 +165,7 @@ msgstr "mostrando criterios" msgid "Month" msgstr "Mes" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:63 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:64 msgid "Show/Hide resources" msgstr "Mostrar/Ocultar recursos" @@ -181,11 +173,11 @@ msgstr "Mostrar/Ocultar recursos" msgid "Set End-Start" msgstr "Definir Fin-Inicio" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:302 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:298 msgid "decreasing zoom" msgstr "reduciendo zoom" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:559 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:590 msgid "Hide critical path" msgstr "Ocultar camino crítico" @@ -193,19 +185,19 @@ msgstr "Ocultar camino crítico" msgid "Day" msgstr "Día" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:599 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:636 msgid "Hide reported hours" msgstr "Ocultar horas reportadas" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:182 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:193 msgid "Load: {0}%" msgstr "Carga: {0}%" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:142 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:147 msgid "showing resources" msgstr "mostrando recursos" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:60 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:61 msgid "Show/Hide labels" msgstr "Mostrar/Ocultar etiquetas" @@ -213,8 +205,8 @@ msgstr "Mostrar/Ocultar etiquetas" msgid "Hour" msgstr "Hora" -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:91 -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:116 +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:90 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:114 msgid "Graphics" msgstr "Gráficas" @@ -222,30 +214,30 @@ msgstr "Gráficas" msgid "Set Start-Start" msgstr "Definir Inicio-Inicio" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:141 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:152 msgid "See resource allocation" msgstr "Ver asignación de recursos" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:285 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:281 msgid "increasing zoom" msgstr "aumentando zoom" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:455 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:467 msgid "Show all elements" msgstr "Mostrar todos los elementos" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:454 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:466 msgid "All" msgstr "Todos" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:39 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:38 msgid "Refresh" msgstr "Actualizar" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:554 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:585 msgid "Show critical path" msgstr "Mostrar camino crítico" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:577 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:614 msgid "Hide progress" msgstr "Ocultar progreso" diff --git a/ganttzk/src/main/resources/i18n/gl.po b/ganttzk/src/main/resources/i18n/gl.po index 798294f78..b284d0d42 100644 --- a/ganttzk/src/main/resources/i18n/gl.po +++ b/ganttzk/src/main/resources/i18n/gl.po @@ -1,20 +1,20 @@ -# Galician translations for LibrePlan package -# Traducciones al español para el paquete LibrePlan. +# Galician translations for LibrePlan - GanttZK module +# Traducciones al español para LibrePlan - módulo GanttZK # Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e # Desenvolvemento Tecnolóxico de Galicia # Copyright (C) 2010-2011 Igalia, S.L. # This file is distributed under the same license as the LibrePlan package. # Igalia , 2009. # Jacobo Aragunde Pérez , 2010. -# Manuel Rego Casasnovas , 2010, 2011. +# Manuel Rego Casasnovas , 2010, 2011. # msgid "" msgstr "" -"Project-Id-Version: 1.1.0\n" +"Project-Id-Version: 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-09 16:17+0200\n" -"PO-Revision-Date: 2011-08-09 16:30+0200\n" -"Last-Translator: Manuel Rego Casasnovas \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" "MIME-Version: 1.0\n" @@ -27,7 +27,7 @@ msgstr "" msgid "Erase" msgstr "Borrar" -#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:319 +#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:299 msgid "Add Dependency" msgstr "Engadir dependencia" @@ -39,20 +39,20 @@ msgstr "Traballador" msgid "Start" msgstr "Inicio" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:592 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:629 msgid "Show reported hours" msgstr "Mostrar horas reportadas" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:92 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:90 msgid "by criteria" msgstr "por criterios" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:72 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:85 msgid "Show/Hide reported hours" msgstr "Mostrar/Ocultar horas reportadas" #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35 -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:46 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:49 msgid "Zoom" msgstr "Zoom" @@ -60,7 +60,7 @@ msgstr "Zoom" msgid "Limiting resources" msgstr "Recursos limitantes" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:68 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:67 msgid "The specified dependency is not allowed" msgstr "A dependencia especificada non está permitida" @@ -68,15 +68,15 @@ msgstr "A dependencia especificada non está permitida" msgid "Set End-End" msgstr "Definir Fin-Fin" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:80 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:78 msgid "Show/Hide progress" msgstr "Mostrar/Ocultar progreso" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:188 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:199 msgid "available effort: {0}, assigned effort: {1}" msgstr "esforzo dispoñible: {0}, esforzo asignado: {1}" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:91 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:89 msgid "by resources" msgstr "por recursos" @@ -88,7 +88,7 @@ msgstr "Tarefa" msgid "Criterion" msgstr "Criterio" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:41 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:44 msgid "Print" msgstr "Imprimir" @@ -96,7 +96,7 @@ msgstr "Imprimir" msgid "Week" msgstr "Semana" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:489 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:501 msgid "filtering by name" msgstr "filtrando por nome" @@ -108,10 +108,6 @@ msgstr "Ver planificación" msgid "End" msgstr "Fin" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:37 -msgid "Choosing Template" -msgstr "Selección de modelo" - #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:243 msgid "changing zoom" msgstr "cambiando zoom" @@ -124,7 +120,7 @@ msgstr "Trimestre" msgid "None" msgstr "Ningún" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:69 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:71 msgid "Flatten/Unflatten tree" msgstr "Aplanar/Expandir árbore" @@ -136,7 +132,7 @@ msgstr "Filtro" msgid "Project" msgstr "Proxecto" -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:68 +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:67 #: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:28 msgid "Name" msgstr "Nome" @@ -145,27 +141,23 @@ msgstr "Nome" msgid "Name filter" msgstr "Filtro por nomes" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:572 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:609 msgid "Show progress" msgstr "Mostrar progreso" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:66 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:67 msgid "Expand/Collapse all" msgstr "Expandir/Pregar todo" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:56 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:58 msgid "Show/Hide critical path" msgstr "Mostrar/Ocultar camiño crítico" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:36 -msgid "Create Project" -msgstr "Crear proxecto" - #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:32 msgid "Year" msgstr "Ano" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:145 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:150 msgid "showing criteria" msgstr "mostrando criterios" @@ -173,7 +165,7 @@ msgstr "mostrando criterios" msgid "Month" msgstr "Mes" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:63 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:64 msgid "Show/Hide resources" msgstr "Mostrar/Ocultar recursos" @@ -181,11 +173,11 @@ msgstr "Mostrar/Ocultar recursos" msgid "Set End-Start" msgstr "Definir Fin-Inicio" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:302 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:298 msgid "decreasing zoom" msgstr "reducindo zoom" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:559 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:590 msgid "Hide critical path" msgstr "Ocultar camiño crítico" @@ -193,19 +185,19 @@ msgstr "Ocultar camiño crítico" msgid "Day" msgstr "Día" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:599 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:636 msgid "Hide reported hours" msgstr "Ocultar horas reportadas" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:182 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:193 msgid "Load: {0}%" msgstr "Carga: {0}%" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:142 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:147 msgid "showing resources" msgstr "mostrando recursos" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:60 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:61 msgid "Show/Hide labels" msgstr "Mostrar/Ocultar etiquetas" @@ -213,8 +205,8 @@ msgstr "Mostrar/Ocultar etiquetas" msgid "Hour" msgstr "Hora" -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:91 -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:116 +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:90 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:114 msgid "Graphics" msgstr "Gráficas" @@ -222,30 +214,30 @@ msgstr "Gráficas" msgid "Set Start-Start" msgstr "Definir Inicio-Inicio" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:141 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:152 msgid "See resource allocation" msgstr "Ver asignación de recursoss" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:285 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:281 msgid "increasing zoom" msgstr "aumentando zoom" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:455 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:467 msgid "Show all elements" msgstr "Mostrar tódolos elementos" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:454 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:466 msgid "All" msgstr "Todos" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:39 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:38 msgid "Refresh" msgstr "Actualizar" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:554 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:585 msgid "Show critical path" msgstr "Mostrar camiño crítico" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:577 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:614 msgid "Hide progress" msgstr "Ocultar progreso" diff --git a/libreplan-webapp/src/main/resources/i18n/es.po b/libreplan-webapp/src/main/resources/i18n/es.po index c6588000a..89b1507d7 100644 --- a/libreplan-webapp/src/main/resources/i18n/es.po +++ b/libreplan-webapp/src/main/resources/i18n/es.po @@ -1,20 +1,20 @@ -# Spanish translations for LibrePlan package -# Traducciones al español para el paquete LibrePlan. +# Spanish translations for LibrePlan - Webapp module +# Traducciones al español para LibrePlan - módulo Webapp # Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e # Desenvolvemento Tecnolóxico de Galicia # Copyright (C) 2010-2011 Igalia, S.L. # This file is distributed under the same license as the LibrePlan package. # Diego Pino García , 2009. # Jacobo Aragunde Pérez , 2009, 2010. -# Manuel Rego Casasnovas , 2010, 2011. +# Manuel Rego Casasnovas , 2010, 2011. # msgid "" msgstr "" -"Project-Id-Version: 1.1.0\n" +"Project-Id-Version: 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-09 16:17+0200\n" -"PO-Revision-Date: 2011-08-09 16:36+0200\n" -"Last-Translator: Manuel Rego Casasnovas \n" +"POT-Creation-Date: 2011-11-10 20:11+0100\n" +"PO-Revision-Date: 2011-11-10 21:26+0100\n" +"Last-Translator: Manuel Rego Casasnovas \n" "Language-Team: Spanish <>\n" "Language: es\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:368 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:373 msgid "The resource cannot be null" msgstr "El recurso no puede ser nulo" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:419 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:420 msgid "criterion codes must be unique inside a criterion type" msgstr "el código del criterio debe ser único dentro de un tipo de criterio" @@ -35,71 +35,65 @@ msgid "No authorizations were added because you did not select any." msgstr "No se pueden añadir autorizaciones porque no se seleccionó ninguna." #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:88 -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:59 -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:45 -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:54 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:58 #: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:71 msgid "en" msgstr "es" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:188 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:192 msgid "Origin" msgstr "Origen" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:165 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:168 msgid "Create exception" msgstr "Crear excepción" -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:45 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:41 msgid "Select report data" msgstr "Seleccione fecha del informe" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:399 -msgid "Up to company view" -msgstr "Arriba a la vista de la compañía" - -#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:207 -msgid "there exist multiple resource calendars with name {0}" -msgstr "existen múltiples calendarios de recursos con el nombre {0}" - #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:60 msgid "Create Virtual Worker" msgstr "Crear trabajador virtual" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:820 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:98 +#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:207 +msgid "there exist multiple resource calendars with name {0}" +msgstr "existen múltiples calendarios de recursos con el nombre {0}" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:830 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:105 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:36 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:52 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:28 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:135 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:137 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:159 -#: libreplan-webapp/src/main/webapp/calendars/_list.zul:28 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:269 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108 +#: libreplan-webapp/src/main/webapp/calendars/_list.zul:31 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:246 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:37 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:56 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:109 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:39 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:44 -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:39 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:26 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:29 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:44 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:37 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:40 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:140 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:28 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:81 #: libreplan-webapp/src/main/webapp/materials/materials.zul:61 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:87 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:86 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:29 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:88 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30 -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:69 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68 #: libreplan-webapp/src/main/webapp/scenarios/_list.zul:28 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:36 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:83 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:48 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:50 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70 @@ -111,45 +105,49 @@ msgstr "Crear trabajador virtual" #: libreplan-webapp/src/main/webapp/templates/_list.zul:34 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:50 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:39 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:231 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:91 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:121 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:163 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:97 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:139 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:180 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:101 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:142 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:101 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:101 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:142 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:109 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:150 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:122 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:229 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:125 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:93 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:135 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:176 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:97 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:97 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:138 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:105 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:146 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:118 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:51 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:54 msgid "Operations" msgstr "Operaciones" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:150 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:536 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:151 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:523 #: libreplan-webapp/src/main/java/org/libreplan/ws/costcategories/impl/CostCategoryConverter.java:135 #: libreplan-webapp/src/main/java/org/libreplan/ws/costcategories/impl/CostCategoryConverter.java:195 msgid "There is no type of work hours with this code" msgstr "No hay un tipo de horas de trabajo con este código" #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:84 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:107 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:112 msgid "Select" msgstr "Seleccionar" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1355 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:215 +msgid "Work report removed successfully" +msgstr "Parte de trabajo borrado con éxito" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1514 msgid "It can not be empty" msgstr "No puede estar vacío" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:315 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 #: libreplan-webapp/src/main/webapp/materials/materials.zul:33 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:98 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:97 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:53 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:145 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:55 @@ -163,57 +161,57 @@ msgstr "Materiales" msgid "Reassign" msgstr "Reasignar" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:62 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:64 msgid "Description cannot be null or empty" msgstr "La descripción no puede ser nula o vacía" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:79 -msgid "login name not specified" -msgstr "nombre de usuario no especificado" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:79 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:362 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:72 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:269 msgid "MonteCarlo Method" msgstr "Método de Montecarlo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:310 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:229 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:247 msgid "Project Scheduling" msgstr "Planificación de proyectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:62 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 msgid "February" msgstr "Febrero" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:28 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:29 msgid "Managing fields and labels" msgstr "Administrar campos y etiquetas" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:356 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:269 msgid "Please, select a calendar" msgstr "Por favor, seleccione un calendario" #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29 -#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:168 +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:170 msgid "Predefined" msgstr "Predefinido" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:267 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:244 msgid "Summary" msgstr "Resumen" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:445 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 #: libreplan-webapp/src/main/webapp/templates/templates.zul:67 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53 msgid "Quality Forms" msgstr "Formularios de calidad" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:330 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 msgid "Reports" msgstr "Informes" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:337 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:22 +msgid "LibrePlan: Advanced allocation" +msgstr "LibrePlan: Asignación avanzada" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:340 msgid "" "The original workable days value {0}, is prevented because consolidated " "values cannot be modified" @@ -221,26 +219,26 @@ msgstr "" "El valor original de días laborables {0}, se evita porque los valores " "consolidados non pueden ser modificados" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:163 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:172 msgid "The {0} sequence prefixes can not be repeated" msgstr "Los prefijos de secuencia de {0} no pueden repetirse" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:81 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:82 msgid "Criterion requirements" msgstr "Criterios requeridos" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:287 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:285 msgid "Stretch date must not be less than task start date: " msgstr "" "La fecha de un tramo debe ser mayor o igual que la fecha de inicio de la " "tarea: " -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:66 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:68 msgid "Dedication chart" msgstr "Gráfico de dedicación" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:701 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:728 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:702 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:729 msgid "Progress that are reported by quality forms can not be modified" msgstr "" "El progreso notificado por formularios de calidad no pueden ser modificado" @@ -249,33 +247,38 @@ msgstr "" msgid "Not the same hours group, impossible to update" msgstr "No es el mismo grupo de horas, imposible actualizar" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:520 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:66 +msgid "Own exception" +msgstr "Excepción propia" + +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:522 msgid "Cannot delete that material because it is assigned to a project." msgstr "No se puede borrar ese material porque está asignado a un projecto." -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:475 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:479 msgid "Remove limiting resource element" msgstr "Borrar elemento de recurso limitante" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:275 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:141 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:155 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:136 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:150 msgid "Resource Usage" msgstr "Uso de recursos" -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:39 +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:40 msgid "Active period from" msgstr "Período activo desde" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:52 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:51 msgid "hours type :" msgstr "tipo de horas :" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:481 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:485 msgid "Unassign" msgstr "Desasignar" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:295 +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:157 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:296 msgid "Companies" msgstr "Empresas" @@ -283,7 +286,7 @@ msgstr "Empresas" msgid "Manual assignment" msgstr "Asignación manual" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:73 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:75 msgid "Quality form items list" msgstr "Lista de elementos del formulario de calidad" @@ -295,16 +298,22 @@ msgstr "" "La fecha de fin no es válida, la nueva fecha de fin debe ser posterior a la " "actual" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:518 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:903 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:128 +msgid "Create {0}: {1}" +msgstr "Crear {0}: {1}" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:51 msgid "generic workers allocation" msgstr "asignación genérica de trabajadores" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:914 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:516 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:890 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:308 msgid "The project has no scheduled elements" msgstr "El proyecto no tiene elementos planificados" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:796 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:806 msgid "Hour start" msgstr "Hora de inicio" @@ -326,11 +335,11 @@ msgstr "categoría de la asignación de coste no especificada" msgid "Delete Template element" msgstr "Borrar elemento de plantilla" -#: libreplan-webapp/src/main/webapp/planner/order.zul:90 -#: libreplan-webapp/src/main/webapp/planner/order.zul:97 -msgid "Progress Consolidation" -msgstr "Consolidación de progreso" +#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:22 +msgid "LibrePlan: Calendars" +msgstr "LibrePlan: Calendarios" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/services/LDAPUserDetailsService.java:65 #: libreplan-webapp/src/main/java/org/libreplan/web/users/services/DBUserDetailsService.java:66 msgid "User with login name '{0}': not found" msgstr "Usuario con login '{0}': no encontrado" @@ -339,21 +348,16 @@ msgstr "Usuario con login '{0}': no encontrado" msgid "Resources capability" msgstr "Capacidad de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:204 -msgid "The first stretch must be after the first day for doing interpolation" -msgstr "" -"El primer tramo debe estar después del primer día para hacer interpolación" - #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26 msgid "Filter quality forms by :" msgstr "Filtrar formularios de calidad por :" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:106 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:108 msgid "changing perspective" msgstr "cambio de perspectiva" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:32 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:31 msgid "Transfer Projects Between Scenarios" msgstr "Transferir proyectos entre escenarios" @@ -365,28 +369,24 @@ msgstr "" "No se pudieron añadir esas autorizaciones al perfil {0} porque ya estaban " "presentes." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:55 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:63 msgid "Default calendar" msgstr "Calendario por defecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:296 -msgid "Cannot delete user: it does not exist anymore" -msgstr "No se puede borrar el usuario: ya no existe" - -#: libreplan-webapp/src/main/webapp/users/profiles.zul:23 -msgid "LibrePlan: Profiles" -msgstr "LibrePlan: Perfiles" - #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:74 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 msgid "Project Name" msgstr "Nombre del proyecto" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:931 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:938 msgid "Indent" msgstr "Indentar" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:312 +msgid "Save passwords in database" +msgstr "Guardar contraseñas en la base de datos" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:255 msgid "Reassignation" msgstr "Reasignación" @@ -399,40 +399,53 @@ msgstr "Plantilla nueva" msgid "Total estimated hours" msgstr "Horas estimadas totales" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:130 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:144 +#: libreplan-webapp/src/main/webapp/common/event_error.zul:22 +#: libreplan-webapp/src/main/webapp/common/error.zul:21 +msgid "LibrePlan: Runtime Error" +msgstr "LibrePlan: Error de ejecución" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:136 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:151 msgid "Base calendar \"{0}\" saved" msgstr "Calendario base \"{0}\" guardado" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:174 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:177 msgid "Exceptions list" msgstr "Lista de excepciones" -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:33 msgid "Locations" msgstr "Ubicaciones" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:76 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:78 msgid "New quality form item" msgstr "Nuevo elemento del formulario de calidad" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:41 +#: libreplan-webapp/src/main/webapp/labels/labelTypes.zul:21 +msgid "LibrePlan: Labels" +msgstr "LibrePlan: Etiquetas" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:242 +msgid "LDAP connection was successful" +msgstr "La conexión con el LDAP se ha realizado con éxito" + +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:43 msgid "Login name" msgstr "Nombre de usuario" +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:81 +msgid "LibrePlan user" +msgstr "Usuario de LibrePlan" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:84 +msgid "{0} List" +msgstr "{0} Lista" + #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:43 msgid "Current" msgstr "Actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:632 -msgid "Machine deleted" -msgstr "Máquina borrada" - -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:22 -msgid "LibrePlan: Progress Report" -msgstr "LibrePlan: Informe de progreso" - -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:67 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:63 msgid "Dependencies" msgstr "Dependencias" @@ -444,7 +457,7 @@ msgstr "falta código en una excepción de calendario" msgid "Current selection" msgstr "Selección actual" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1134 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1130 msgid "" "there exist criterion satisfactions referring to criterion types not " "applicable to this resource" @@ -470,28 +483,36 @@ msgstr "Minutos" msgid "You can not remove a scenario with derived scenarios" msgstr "No se puede eliminar un escenario con escenarios derivados" -#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:23 -msgid "Create new version" -msgstr "Crear versión nueva" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:948 +msgid "Work Report Types" +msgstr "Tipos de partes de trabajo" + +#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:55 +msgid "Maximum/minimum of estimated hours" +msgstr "Máximo/mínimo de horas estimadas" + +#: libreplan-webapp/src/main/webapp/qualityforms/qualityForms.zul:22 +msgid "LibrePlan: Quality Forms" +msgstr "LibrePlan: Formularios de calidad" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/ResourceAllocationBehaviour.java:63 msgid "LIMITING" msgstr "LIMITANTE" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:324 -msgid "Derived" -msgstr "Derivado" - -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:414 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:415 msgid "a disabled resource has enabled subresources" msgstr "un recurso deshabilitado tiene subrecursos habilitados" #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:51 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:53 msgid "Client" msgstr "Cliente" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:651 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:350 +msgid "Role search query:" +msgstr "Consulta para la búsqueda de roles:" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:662 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:153 msgid "" "there are no resources for required criteria: {0}. So the generic allocation " @@ -500,11 +521,11 @@ msgstr "" "no hay recursos con los criterios solicitados: {0}. Por tanto, no se puede " "añadir la asignación genérica" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:446 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:478 msgid "Error on showing warning message removing calendar: " msgstr "Error al mostrar mensaje de advertencia borrando calendario: " -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:428 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:415 msgid "work report has not any description value with this field name" msgstr "" "El parte de trabajo no tiene ningún valor de descripción con ese nombre de " @@ -520,12 +541,12 @@ msgstr "el nombre de la categoría de materiales debe ser único. Ya está en us msgid "Imputed hours" msgstr "Horas imputadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:37 msgid "Project Costs Per Resource" msgstr "Costes de proyecto por recurso" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:530 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 msgid "Confirm deleting this hour cost. Are you sure?" msgstr "Confirmar el borrado de este coste por hora. ¿Está seguro?" @@ -534,15 +555,19 @@ msgstr "Confirmar el borrado de este coste por hora. ¿Está seguro?" msgid "Delete Milestone" msgstr "Borrar hito" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:152 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:155 msgid "default password were not changed" msgstr "la contraseña por defecto no fue cambiada" +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:112 +msgid "Type of hours" +msgstr "Tipo de horas" + #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:48 msgid "Non-assigned locations" msgstr "Ubicaciones no asignadas" -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:75 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:77 msgid "Application URI" msgstr "URI de la aplicación" @@ -554,21 +579,22 @@ msgstr "" "{0} no es válido, criterionType se solapa con otro criterionSatisfaction del " "mismo criterionType" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 msgid "Work Report Lines" msgstr "Líneas de parte de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1514 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1546 msgid "Configure" msgstr "Configurar" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:70 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45 msgid "October" msgstr "Octubre" +#: libreplan-webapp/src/main/webapp/settings/settings.zul:58 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:36 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:57 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:58 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:50 msgid "First name" msgstr "Nombre" @@ -576,20 +602,16 @@ msgstr "Nombre" msgid "Could not execute print command" msgstr "No se pudo ejecutar el comando de impresión" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:119 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:122 msgid "Complementary text fields" msgstr "Campos de texto complementario" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:208 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1242 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:418 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:137 -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:141 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:291 -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:181 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:851 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:199 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:210 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:450 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:827 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 msgid "Confirm deleting {0}. Are you sure?" msgstr "Confirmar el borrado de {0}. ¿Está seguro?" @@ -597,7 +619,7 @@ msgstr "Confirmar el borrado de {0}. ¿Está seguro?" msgid "Work Reports List" msgstr "Lista de partes de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:313 msgid "Accounts" msgstr "Cuentas" @@ -605,7 +627,7 @@ msgstr "Cuentas" msgid "External code" msgstr "Código externo" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:48 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:50 msgid "Edit selected task" msgstr "Editar tarea seleccionada" @@ -615,33 +637,33 @@ msgstr "Ver" #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:38 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:39 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:88 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:84 msgid "Limiting" msgstr "Limitante" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:61 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:60 msgid "Required materials" msgstr "Materiales requeridos" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:666 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:677 msgid "resources per day must be not empty and bigger than zero" msgstr "los recursos por día deben ser no vacíos y mayores que cero" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:341 msgid "Backwards" msgstr "Atrás" -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68 -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:78 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:67 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:77 msgid "Version" msgstr "Versión" -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51 +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:52 msgid "Apply filtering to resources satisfying required criteria" msgstr "" "Aplicar filtrado a los recursos que satisfacen los criterios requeridos" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:104 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:106 msgid "Up" msgstr "Arriba" @@ -653,7 +675,7 @@ msgstr "" "El tipo de criterio no es válido, otro criterio satisfecho se solapa con el " "mismo tipo de criterio" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:105 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:125 msgid "Types of work hours" msgstr "Tipos de horas de trabajo" @@ -666,7 +688,7 @@ msgstr "EAC" msgid "Stacktrace:" msgstr "Stacktrace:" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:143 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:144 msgid "" "Its planning is not in the current scene.\n" "Should change to any of the following scenarios:\n" @@ -674,37 +696,19 @@ msgstr "" "Su planificación no está en el escenario actual.\n" "Debe cambiar a uno de los siguientes:\n" -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:37 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:39 msgid "Predecessor" msgstr "Predecesor" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:189 -msgid "Some stretch has higher or equal values than the previous stretch" -msgstr "Algún tramo tiene valores mayores o iguales que el tramo anterior" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:55 msgid "Please select a task" msgstr "Por favor, seleccione una tarea" -#: libreplan-webapp/src/main/webapp/costcategories/costCategory.zul:23 -msgid "LibrePlan: Cost Categories" -msgstr "LibrePlan: Categorías de coste" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:172 +msgid "Some stretch has higher or equal values than the previous stretch" +msgstr "Algún tramo tiene valores mayores o iguales que el tramo anterior" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80 -#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:58 -#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:75 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:60 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:62 -msgid "End date" -msgstr "Fecha de fin" - -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:255 -msgid "missing worker code in the work report" -msgstr "falta código de trabajador en un parte de trabajo" - -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:142 +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:101 msgid "" "Value is not valid, the default max value must be greater than the precision " "value " @@ -712,56 +716,59 @@ msgstr "" "El valor no es válido, el valor máximo por defecto debe ser mayor que el " "valor de precisión" -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:146 -msgid "" -"You can not remove the company \"{0}\" because is already in use in some " -"project or in some subcontrated task." -msgstr "" -"No puede borrar la empresa \"{0}\" porque está siendo utilizada en ulgún " -"proyecto o en alguna tarea subcontrada." +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:245 +msgid "missing worker code in the work report" +msgstr "falta código de trabajador en un parte de trabajo" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:88 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82 +#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:45 +#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:61 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:60 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:58 +msgid "End date" +msgstr "Fecha de fin" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:89 msgid "profile name is already being used by another profile" msgstr "el nombre del perfil ya está siendo usado por otro perfil" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:63 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:68 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:76 msgid "E-mail" msgstr "Correo electrónico" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:209 -msgid "Prefix:" -msgstr "Prefijo:" - -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:107 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:106 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:112 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:110 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:112 msgid "This project has already been added." msgstr "Este proyecto ya ha sido añadido." -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:381 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:204 +msgid "Prefix:" +msgstr "Prefijo:" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:386 msgid "The task code cannot be null" msgstr "El código de la tarea no puede ser nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:580 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:593 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 msgid "Criteria" msgstr "Criterios" -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:134 msgid "Resource / Criteria" msgstr "Recursos / Criterios" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:26 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:27 msgid "User data" msgstr "Datos del usuario" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:97 -msgid "Error setting up creation form." -msgstr "Error preparando el formulario de creación." - #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:44 msgid "Lines" msgstr "Líneas" @@ -770,12 +777,16 @@ msgstr "Líneas" msgid "Add new progress assignment" msgstr "Añadir nueva asignación de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:193 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:32 +msgid "Set Filter Options" +msgstr "Establecer las opciones de filtrado" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:977 msgid "Error on showing warning message removing workReportType: " msgstr "" "Error al mostrar mensaje de advertencia borrando tipo de parte de trabajo: " -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:624 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:633 msgid "Edit Work Report" msgstr "Editar parte de trabajo" @@ -788,36 +799,35 @@ msgid "Project version is the same in source and destination scenarios" msgstr "" "La versión del proyecto es la misma en los escenarios de origen y destino" -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:30 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:31 msgid "Personal data" msgstr "Datos personales" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:732 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:733 msgid "Calculated progress can not be removed" msgstr "El progreso calculado no se puede borrar" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:299 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:162 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:200 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:158 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:199 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:331 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:164 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:202 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:159 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:202 msgid "please, select a Criterion" msgstr "por favor, seleccione un criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/OrderAuthorizationModel.java:127 -msgid "Project does not exist" -msgstr "El proyecto no existe" +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:112 +msgid "Work reports" +msgstr "Partes de trabajo" #: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/EntryPointsHandler.java:143 msgid "{0} annotation required on {1}" msgstr "{0} anotación obligatoria en {1}" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:66 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "June" msgstr "Junio" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1031 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1038 msgid "Modified" msgstr "Modificado" @@ -829,14 +839,14 @@ msgstr "Añadir criterio" msgid "You can not remove the current scenario" msgstr "No se puede borrar el escenario actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:648 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:653 msgid "format prefix invalid. It cannot be empty or contain whitespaces." msgstr "" "formato de prefijo inválido. No puede estar vacío o contener espacios en " "blanco." #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:89 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:334 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:338 msgid "MessagesContainer is needed" msgstr "Es necesario un MessagesContainer" @@ -848,10 +858,14 @@ msgstr "Código de la tarea" #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:69 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:56 msgid "Ending date" msgstr "Fecha de fin" +#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:21 +msgid "LibrePlan: Page not found" +msgstr "LibrePlan: Página no encontrada" + #: libreplan-webapp/src/main/webapp/templates/_list.zul:21 msgid "Templates List" msgstr "Lista de plantillas" @@ -860,7 +874,7 @@ msgstr "Lista de plantillas" msgid "Export options" msgstr "Opciones de exportación" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:229 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:227 msgid "Last value" msgstr "Último valor" @@ -868,7 +882,11 @@ msgstr "Último valor" msgid "Subcontracted Tasks List" msgstr "Lista de tareas subcontratadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:705 +#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:51 +msgid "Average of worked hours in finished applications" +msgstr "Media de horas trabajadas en las aplicaciones finalizadas" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:706 msgid "Calculated progress can not be modified" msgstr "El progreso calculado no se puede modificar" @@ -876,40 +894,43 @@ msgstr "El progreso calculado no se puede modificar" msgid "Statistics log" msgstr "Histórico de estadísticas" -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:51 #: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:40 #: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:47 msgid "Edit Calendar" msgstr "Editar calendario" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:112 +msgid "Profile" +msgstr "Perfil" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:37 msgid "Materials Needs At Date" msgstr "Necesidades de materiales en fecha" #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:35 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:41 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:52 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:59 msgid "Cannot be empty or null" msgstr "No puede ser vacío o nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:275 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:300 msgid "filtering" msgstr "filtrado" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:233 +msgid "{0} \"{1}\" saved" +msgstr "{0} \"{1}\" guardado" + #: libreplan-webapp/src/main/webapp/orders/_list.zul:33 msgid "Total Budget" msgstr "Presupuesto total" -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:53 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:55 msgid "Hierarchy" msgstr "Jerarquía" -#: libreplan-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:23 -msgid "LibrePlan: Work Hours" -msgstr "LibrePlan: Horas de trabajo" - -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:830 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:833 msgid "" "This worker cannot be deleted because it has assignments to projects or " "imputed hours" @@ -926,19 +947,23 @@ msgstr "Imprimir configuración" msgid "Overload due to other assignments" msgstr "Sobrecarga debido a otras asignaciones" +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:117 +msgid "Types of hours" +msgstr "Tipos de horas" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:149 msgid "Time period saved" msgstr "Período de tiempo guardado" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:305 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:168 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:206 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:164 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:205 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:337 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:170 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:208 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:165 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:208 msgid "This Criterion has already been added." msgstr "Este criterio ya ha sido añadido." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:250 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:252 msgid "" "Are you sure of changing the resource type? You will lose the criteria with " "different resource type." @@ -946,7 +971,7 @@ msgstr "" "¿Está seguro de cambiar el tipo de recurso? Los criterios con diferente tipo " "de recurso se perderán." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:215 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:209 msgid "add" msgstr "añadir" @@ -955,7 +980,7 @@ msgid "Unsaved changes will be lost. Would you like to continue?" msgstr "Se perderán los cambios sin guardar. ¿Le gustaría continuar?" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:41 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:35 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:34 msgid "Filter work report by :" msgstr "Filtrar parte de trabajo por :" @@ -963,7 +988,7 @@ msgstr "Filtrar parte de trabajo por :" msgid "NON_LIMITING" msgstr "NO_LIMITANTE" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:290 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:291 msgid "Workers" msgstr "Trabajadores" @@ -971,8 +996,7 @@ msgstr "Trabajadores" msgid "Cannot remove {0}, since it is being used by some Exception Day" msgstr "No se puede borrar {0} porque se está usando en algún día de excepción" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:68 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45 msgid "August" msgstr "Agosto" @@ -980,11 +1004,23 @@ msgstr "Agosto" msgid "Resources matching selected criteria" msgstr "Recursos que cumplen los criterios seleccionados" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:52 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:27 +msgid "with" +msgstr "con" + +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:297 +msgid "Label Type" +msgstr "Tipo de etiqueta" + +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:48 msgid "Year" msgstr "Año" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:67 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:327 +msgid "{0} \"{1}\" could not be deleted, it was already removed" +msgstr "{0} \"{1}\" no se ha podido borrar, ya había sido eliminado" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:68 msgid "profile name not specified" msgstr "nombre del perfil no especificado" @@ -992,52 +1028,44 @@ msgstr "nombre del perfil no especificado" msgid "Date Start" msgstr "Fecha de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1281 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1275 msgid "Value is not valid, the current value must be less than max value" msgstr "" "El valor no es válido, el valor actual debe ser menor que el valor máximo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:55 -msgid "From Chosen" -msgstr "A partir de elegidos" - #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 -#: libreplan-webapp/src/main/webapp/planner/order.zul:109 +#: libreplan-webapp/src/main/webapp/planner/order.zul:108 msgid "Value" msgstr "Valor" -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:64 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:66 msgid "Hour costs" msgstr "Costes por hora" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:718 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:773 msgid "there are no valid periods for this calendar" msgstr "no hay períodos válidos para este calendario" -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:52 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:76 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:54 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:93 msgid "Add role" msgstr "Añadir rol" -#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:41 -msgid "Edit Scenario" -msgstr "Editar escenario" - -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:642 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1112 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:634 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1271 msgid "Exception end date should be greater or equals than start date" msgstr "" "La fecha de fin de una excepción debe ser mayor o igual que la fecha de " "inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:601 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:611 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:443 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:453 msgid "Repeated Project code {0} in Project {1}" msgstr "Código {0} de proyecto repetdio en proyecto {1}" -#: libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java:274 +#: libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java:277 msgid "Project from client" msgstr "Proyecto del cliente" @@ -1053,7 +1081,7 @@ msgstr "" "El {0} no se puede asignar a este recurso. Su intervalo se solapa con otro " "criterio" -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:66 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:62 msgid "Work done until ending date:" msgstr "Trabajo realizado hasta la fecha de fin:" @@ -1061,31 +1089,28 @@ msgstr "Trabajo realizado hasta la fecha de fin:" msgid "Schedule Performance Index" msgstr "Índice de rendimiento de la planificación" -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:138 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:135 msgid "Earlier starting date" msgstr "Fecha de inicio más temprana" -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:26 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:27 msgid "Type data" msgstr "Datos del tipo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:313 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:117 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:314 msgid "Profiles" msgstr "Perfiles" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:800 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:810 msgid "Hour finish" msgstr "Hora de fin" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:173 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:165 msgid "Perspectives" msgstr "Perspectivas" -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:40 -msgid "Edit Work Report Type" -msgstr "Editar tipo de parte de trabajo" - -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:104 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:107 msgid "Workable time" msgstr "Tiempo trabajable" @@ -1093,20 +1118,11 @@ msgstr "Tiempo trabajable" msgid "missing code in a subcategory" msgstr "falta código en una subcategoría" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:544 -msgid "Confirm deleting this cost category. Are you sure?" -msgstr "Confirmar el borrado de esta categoría de coste. ¿Está seguro?" - #: libreplan-webapp/src/main/webapp/planner/editTask.zul:66 msgid "Non limiting resource allocation" msgstr "Asignación de recursos no limitantes" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:191 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:297 -msgid "Error removing element: " -msgstr "Error al borrar elemento: " - -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:39 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:40 msgid "Company name" msgstr "Nombre de la empresa" @@ -1119,16 +1135,15 @@ msgid "Split new assignment" msgstr "Dividir nueva asignación" #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:67 -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:53 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:57 msgid "Pagination" msgstr "Paginación" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:265 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:286 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:263 msgid "Expiry date" msgstr "Fecha de vencimiento" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:337 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:342 msgid "" "The operation does not perform because the task has progress reports that is " "spread associated with this quality form" @@ -1145,16 +1160,16 @@ msgstr "Cambiar escenario" msgid "Critical path" msgstr "Camino crítico" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:260 msgid "" "Deleting this item, it will disable the report progress option. Are you sure?" msgstr "" "Borrando este elemento, esto deshabilitará la opción de notificar progreso. " "¿Está seguro?" -#: libreplan-webapp/src/main/webapp/materials/materials.zul:38 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:42 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:83 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:41 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:41 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:80 msgid "Categories" msgstr "Categorías" @@ -1163,23 +1178,19 @@ msgstr "Categorías" msgid "Status code:" msgstr "Código de estado:" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:181 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:180 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:46 msgid "Project Details" msgstr "Detalles de proyecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:94 -msgid "Create Criterion Type" -msgstr "Crear tipo de criterio" - -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:107 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:206 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:225 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:89 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:221 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:159 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:181 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:189 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:162 msgid " to go to output directly" msgstr " ir a la salida directamente" @@ -1187,16 +1198,20 @@ msgstr " ir a la salida directamente" msgid "Add new hours group" msgstr "Añadir nuevo grupo de horas" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:219 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:221 msgid "Criteria: {0} " msgstr "Criterios: {0} " -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:385 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85 -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:63 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:44 +msgid "Cancel changes and back to scheduling" +msgstr "Cancelar cambios y volver a la planificación" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:386 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87 +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:65 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68 -#: libreplan-webapp/src/main/webapp/planner/order.zul:110 +#: libreplan-webapp/src/main/webapp/planner/order.zul:109 msgid "Percentage" msgstr "Porcentaje" @@ -1204,7 +1219,7 @@ msgstr "Porcentaje" msgid "Updated" msgstr "Actualizado" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:71 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:81 msgid "Company logo URL" msgstr "URL del logo de la empresa" @@ -1212,11 +1227,11 @@ msgstr "URL del logo de la empresa" msgid "No worker selected" msgstr "Ningún trabajador seleccionado" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:227 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:225 msgid "Number of digits" msgstr "Número de dígitos" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1651 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1639 msgid "Task not found" msgstr "Tarea no encontrada" @@ -1225,24 +1240,16 @@ msgstr "Tarea no encontrada" msgid "Total capability" msgstr "Capacidad total" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:732 -msgid "It not could remove the task " -msgstr "No se pudo borrar la tarea" +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 +msgid "Is a libreplan user" +msgstr "Es un usuario de libreplan" #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesModel.java:217 msgid "Problems connecting with client web service" msgstr "Problemas al conectar con el servicio web cliente" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:21 -msgid "LibrePlan: User access" -msgstr "LibrePlan: Acceso de usuarios" - -#: libreplan-webapp/src/main/webapp/materials/materials.zul:21 -msgid "LibrePlan: Materials" -msgstr "LibrePlan: Materiales" - -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:154 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:183 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:157 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:186 msgid "Exception Type" msgstr "Tipo de excepción" @@ -1250,11 +1257,11 @@ msgstr "Tipo de excepción" msgid "Profiles List" msgstr "Lista de Perfiles" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:567 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:944 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:580 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:689 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:236 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:869 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:919 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:51 #: libreplan-webapp/src/main/webapp/templates/templates.zul:64 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 @@ -1267,7 +1274,7 @@ msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "" "{0} de la categoría {1} y {2} de la categoría {3} tienen el mismo código" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319 msgid "Data Types" msgstr "Tipos de datos" @@ -1276,25 +1283,25 @@ msgstr "Tipos de datos" msgid "Total hours" msgstr "Total de horas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:342 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:38 +msgid "Data" +msgstr "Datos" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:343 msgid "Reassigning {0} projects" msgstr "Reasignando {0} proyectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:84 -msgid "Create Work Hours Type" -msgstr "Crear tipo de horas de trabajo" - -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:59 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:55 msgid "Filter by task status" msgstr "Filtrar por estado de tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:528 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:430 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:498 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:420 msgid "Select date:" msgstr "Seleccione fecha:" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:635 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1105 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:627 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1264 msgid "You should select a end date for the exception" msgstr "Debe seleccionar una fecha de fin para la excepción" @@ -1302,7 +1309,7 @@ msgstr "Debe seleccionar una fecha de fin para la excepción" msgid "Please try it again." msgstr "Por favor, inténtelo de nuevo." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:49 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:56 msgid "Company code" msgstr "Código de la empresa" @@ -1310,57 +1317,54 @@ msgstr "Código de la empresa" msgid "Unknown attribute '{0}' in class {1}" msgstr "Atributo desconocido '{0}' en la clase {1}" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:714 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:717 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:33 msgid "NON LIMITING RESOURCE" msgstr "RECURSO NO LIMITANTE" -#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:22 -msgid "LibrePlan: Workers" -msgstr "LibrePlan: Trabajadores" - -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:117 -msgid "Activation periods" -msgstr "Períodos de activación" - -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:389 -msgid "Passed" -msgstr "Pasado" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:90 +msgid "passwords can not be empty" +msgstr "las conraseñas no pueden estar vacías" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:88 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:128 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:175 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:176 msgid "already assigned" msgstr "ya asignado" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:34 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:68 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:390 +msgid "Passed" +msgstr "Pasado" + +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:120 +msgid "Activation periods" +msgstr "Períodos de activación" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:509 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:74 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:131 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:119 -#: libreplan-webapp/src/main/webapp/planner/order.zul:155 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:139 +#: libreplan-webapp/src/main/webapp/planner/order.zul:154 msgid "Calendar" msgstr "Calendario" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:301 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:119 +msgid "Resources" +msgstr "Recursos" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:56 msgid "Read" msgstr "Leer" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:99 -msgid "Resources" -msgstr "Recursos" - #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java:153 msgid "Source and destination scenarios should be different" msgstr "Los escenarios de origen y destino deben ser diferentes" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:230 -msgid "CriterionType and its criteria saved" -msgstr "Tipo de criterio y sus criterios guardados" - -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:137 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:141 msgid "The browser you are using" msgstr "El navegador que está usando" @@ -1369,23 +1373,18 @@ msgid "scenario" msgstr "escenario" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:51 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:50 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:248 -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:41 -#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:30 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:49 +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:42 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:42 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:29 msgid "to" msgstr "a" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:197 -msgid "Error on removing typeOfWorkHours: " -msgstr "Error al borrar tipo de horas de trabajo: " - -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:112 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:115 msgid "worker's first name not specified" msgstr "nombre del trabajador no especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:276 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:281 msgid "date not specified" msgstr "fecha no especificada" @@ -1393,9 +1392,9 @@ msgstr "fecha no especificada" msgid "Select type :" msgstr "Seleccione tipo :" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:263 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:259 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:269 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:264 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:196 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:206 msgid "Projects Planning" msgstr "Planificación de proyectos" @@ -1403,12 +1402,18 @@ msgstr "Planificación de proyectos" msgid "Shrink to fit page width" msgstr "Reducir para ajustar al ancho de página" -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:67 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:773 +msgid "The max value must be greater than 0" +msgstr "El valor máximo debe ser mayor que 0" + +#: libreplan-webapp/src/main/webapp/settings/settings.zul:63 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:70 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:55 msgid "Last name" msgstr "Apellidos" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:348 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:551 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:380 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:556 msgid "Remove" msgstr "Borrar" @@ -1416,15 +1421,15 @@ msgstr "Borrar" msgid "cost category name not specified" msgstr "nombre de la categoría de coste no especificado" -#: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:22 -msgid "LibrePlan: Virtual Workers Groups" -msgstr "LibrePlan: Grupos de trabajadores virtuales" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:131 msgid "SPI" msgstr "SPI" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1334 +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:232 +msgid "Progress Type" +msgstr "Tipo de progreso" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1295 msgid "Task contains consolidated progress. Cannot apply sigmoid function." msgstr "" "La tarea contiene progreso consolidado. No se puede aplicar la función " @@ -1439,19 +1444,23 @@ msgstr "" "La fecha de inicio no es válida, la fecha de inicio nueva debe ser anterior " "a la fecha de inicio actual" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:516 +msgid "This date can not include the whole previous work week" +msgstr "Esta fecha no puede incluir a la semana de trabajo anterior completa" + #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:390 msgid "the code must be not null or not empty" msgstr "el código no puede ser nulo o vacío" -#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:35 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:119 msgid "Create New Project" msgstr "Crear proyecto nuevo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1420 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1430 msgid "Stretches list" msgstr "Lista de tramos" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:187 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:180 msgid "Enable scenarios module" msgstr "Habilitar módulo de escenarios" @@ -1459,52 +1468,50 @@ msgstr "Habilitar módulo de escenarios" msgid "Zoom" msgstr "Zoom" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:608 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:41 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:211 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:829 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:205 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:185 -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:46 -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:52 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:95 +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:78 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:124 +#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:44 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:97 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:48 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:88 -#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:45 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:90 +#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:44 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:45 #: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:40 #: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:41 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:106 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:117 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:115 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:39 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:130 -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38 -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:41 -#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:38 -#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:42 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:81 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:92 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:80 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:135 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:130 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:241 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:132 +#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:64 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:76 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:81 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:151 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:135 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:376 msgid "Save" msgstr "Guardar" -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:62 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:33 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:72 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34 msgid "Standard Effort" msgstr "Esfuerzo estándar" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:109 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:129 msgid "Material categories" msgstr "Categorías de materiales" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:240 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:570 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:669 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:273 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:576 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:674 msgid "number of digits must be between {0} and {1}" msgstr "el número de dígitos debe estar entre {0} y {1}" @@ -1516,7 +1523,7 @@ msgstr "Criterios requeridos" msgid "Pending update" msgstr "Actualización pendiente" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:59 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55 msgid "End date:" msgstr "Fecha de fin:" @@ -1532,23 +1539,47 @@ msgstr "Autorización de usuarios" msgid "Problems connecting with subcontractor web service" msgstr "Problemas conectando con el servicio web subcontratista" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:219 +msgid "Entity type" +msgstr "Tipo de entidad" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:263 +msgid "Unsaved changes will be lost. Are you sure?" +msgstr "Se perderán los cambios sin guardar. ¿Está seguro?" + +#: libreplan-webapp/src/main/webapp/templates/templates.zul:22 +#: libreplan-webapp/src/main/webapp/planner/order.zul:22 +#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:22 +#: libreplan-webapp/src/main/webapp/planner/index.zul:22 +#: libreplan-webapp/src/main/webapp/planner/resources_use.zul:22 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:22 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22 +#: libreplan-webapp/src/main/webapp/planner/main.zul:22 +#: libreplan-webapp/src/main/webapp/resourceload/resourceload.zul:22 +msgid "LibrePlan: Scheduling" +msgstr "LibrePlan: Planificación" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:277 +msgid "UserDn:" +msgstr "UserDn:" + #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:44 msgid "Assigned load" msgstr "Carga asignada" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:139 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:142 msgid "End Date" msgstr "Fecha de fin" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:68 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:64 msgid "Filter by workers" msgstr "Filtrar por trabajadores" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:374 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73 msgid "Some allocations needed" msgstr "Se necesitan algunas asignaciones" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:83 msgid "Resources Per Day" msgstr "Recursos por día" @@ -1564,7 +1595,7 @@ msgstr "" "Fecha de fin estimada para la tarea (presione enter en el cuadro de texto " "para abrir el calendario o escriba la fecha directamente)" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:281 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:292 msgid "Expand/Collapse all" msgstr "Expandir/Plegar todo" @@ -1572,34 +1603,33 @@ msgstr "Expandir/Plegar todo" msgid "Overload due to current project" msgstr "Sobrecarga debido al proyecto actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:857 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:907 msgid "Name: {0}" msgstr "Nombre: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:867 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:874 msgid "Move down" msgstr "Mover abajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:116 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:112 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:137 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:118 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:113 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:139 msgid "Please, select a project" msgstr "Por favor, seleccione un proyecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:69 +#: libreplan-webapp/src/main/webapp/calendars/_list.zul:29 +msgid "Inherits from date" +msgstr "Heredada de la fecha" + +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45 msgid "September" msgstr "Septiembre" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:27 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:28 msgid "Report structure" msgstr "Estructura del parte" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:88 -msgid "password not specified" -msgstr "contraseña no especificada" - -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:118 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:119 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:42 #: libreplan-webapp/src/main/webapp/templates/templates.zul:59 msgid "General data" @@ -1609,11 +1639,12 @@ msgstr "Datos generales" msgid "BAC" msgstr "BAC" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:399 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:379 msgid "Calculate Number of Hours" msgstr "Calcular número de horas" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:105 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38 msgid "Assign" @@ -1623,34 +1654,24 @@ msgstr "Asignar" msgid "missing code in a criterion" msgstr "falta código en un criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1296 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1273 msgid "Create Template" msgstr "Crear plantilla" -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:23 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:23 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:23 -msgid "LibrePlan: Work Reports" -msgstr "LibrePlan: Partes de trabajo" - -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:115 -msgid "Edit Company" -msgstr "Editar empresa" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:60 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:67 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:68 msgid "Advanced search" msgstr "Búsqueda avanzada" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:99 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:116 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:78 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:78 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:86 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:95 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:112 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:74 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:74 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:82 msgid "Filter by labels" msgstr "Filtrar por etiquetas" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:574 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:577 msgid "" "IMPORTANT: Don't forget to communicate to subcontractor that his contract " "has been cancelled" @@ -1658,30 +1679,32 @@ msgstr "" "IMPORTANTE: No olvidar comunicar al subcontratista que su contrato ha sido " "cancelado" -#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:38 +#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:36 msgid "MonteCarlo chart" msgstr "Diagrama de Montecarlo" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:21 -msgid "LibrePlan: Hours Worked Per Resource" -msgstr "LibrePlan: Horas Trabajadas Por Recurso" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:126 msgid "Schedule Variance" msgstr "Desviación en planificación" +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:496 +msgid "Error on showing warning message removing qualityForm: " +msgstr "" +"Error al mostrar mensaje de advertencia borrando un formulario de calidad: " + #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:410 msgid "Service does not manage resource of type: {0}" msgstr "El servicio no gestiona recursos del tipo: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:191 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:442 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:185 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:210 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:506 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:544 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:575 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1365 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:974 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:474 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:492 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:103 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:148 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:509 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:547 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:578 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73 msgid "Warning" msgstr "Advertencia" @@ -1690,15 +1713,13 @@ msgstr "Advertencia" msgid "Select parent calendar" msgstr "Seleccionar el calendario padre" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:96 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:168 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:463 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:526 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:450 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:513 msgid "There is no task with this code" msgstr "No hay ninguna tarea con este código " -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:433 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:214 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:441 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:146 msgid "The type of hours cannot be null" msgstr "El tipo de horas no puede ser nulo" @@ -1707,14 +1728,14 @@ msgid "criterion satisfaction with end date less than start date" msgstr "el criterio satisfecho tiene fecha de fin anterior a la de inicio" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:112 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:230 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:190 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:167 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:189 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:197 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:170 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:94 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:214 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:226 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166 msgid "Show" msgstr "Mostrar" @@ -1726,18 +1747,6 @@ msgstr "Duración (días)" msgid "Assignment Type" msgstr "Tipo de asignación" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:22 -#: libreplan-webapp/src/main/webapp/planner/order.zul:22 -#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:22 -#: libreplan-webapp/src/main/webapp/planner/index.zul:22 -#: libreplan-webapp/src/main/webapp/planner/resources_use.zul:22 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:22 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22 -#: libreplan-webapp/src/main/webapp/planner/main.zul:22 -#: libreplan-webapp/src/main/webapp/resourceload/resourceload.zul:22 -msgid "LibrePlan: Scheduling" -msgstr "LibrePlan: Planificación" - #: libreplan-webapp/src/main/webapp/common/layout/timeout.zul:29 msgid "Back to log in" msgstr "Volver a iniciar sesión" @@ -1751,31 +1760,28 @@ msgstr "Error al dividir" msgid "Planned start :" msgstr "Inicio planificado :" -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47 -msgid "Company" -msgstr "Empresa" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:66 msgid "Node without children" msgstr "Nodo sin hijos" +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:152 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47 +msgid "Company" +msgstr "Empresa" + #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:118 msgid "There is no label with this code " msgstr "No hay ninguna etiqueta con este código " -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:210 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:212 msgid "Task: {0} " msgstr "Tarea: {0} " -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:138 -msgid "Profile saved" -msgstr "Perfil guardado" - #: libreplan-webapp/src/main/webapp/planner/editTask.zul:65 msgid "Task properties" msgstr "Propiedades de la tarea" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:75 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:84 msgid "There is no type of work report with this code" msgstr "No hay ningún parte de trabajo con este código" @@ -1788,10 +1794,6 @@ msgstr "Suma de horas imputadas directamente" msgid "Surname" msgstr "Apellidos" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1364 -msgid "You need to select some function to configure" -msgstr "Necesita seleccionar alguna función para configurar" - #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:22 msgid "Exception Day Types List" msgstr "Lista de tipos de día de excepción" @@ -1800,70 +1802,61 @@ msgstr "Lista de tipos de día de excepción" msgid "the name must be not null or not empty" msgstr "el nombre no puede ser nulo o vacío" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:741 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:393 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:157 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:750 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:394 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:154 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:68 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:131 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:67 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:69 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:77 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:87 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 -#: libreplan-webapp/src/main/webapp/planner/order.zul:111 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:49 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45 +#: libreplan-webapp/src/main/webapp/planner/order.zul:110 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:48 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 msgid "Date" msgstr "Fecha" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:363 -msgid "there must be {0} effort instead of {1}" -msgstr "debe haber {0} esfuerzo en lugar de {1}" - #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:42 msgid "Add From Template" msgstr "Añadir a partir de plantilla" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:505 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:543 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:508 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:546 msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "Los recursos asignados para esta tarea serán borrados. ¿Está seguro?" -#: libreplan-webapp/src/main/webapp/excetiondays/exceptionDays.zul:22 -msgid "LibrePlan: Exception Days" -msgstr "LibrePlan: Días de excepción" - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:646 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:651 msgid "" "format prefix invalid. It cannot be empty or contain '_' or whitespaces." msgstr "" "formato de prefijo inválido. No puede estar vacío o contener '_' o espacios " "en blanco." -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:45 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:41 msgid "Filter by month" msgstr "Filtrar por mes" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:351 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:361 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:320 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:322 msgid "The criterion and its type cannot be null" msgstr "El criterio y su tipo no pueden ser nulos" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:526 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:421 msgid "The quality form must have an item with 100% value to report progress" msgstr "" "El formulario de calidad debe tener un ítem con valor 100% para notificar " "progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:67 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "July" msgstr "Julio" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:220 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:156 msgid "The code is not valid. There is another unit type with the same code" msgstr "El código no es válido. Hay otro tipo de unidad con el mismo código" @@ -1871,16 +1864,15 @@ msgstr "El código no es válido. Hay otro tipo de unidad con el mismo código" msgid "( max: {0} )" msgstr "( máx: {0} )" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:218 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:222 msgid "Error on removing element: " msgstr "Error al borrar elemento: " -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:61 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 msgid "January" msgstr "Enero" -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:64 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:60 msgid "Cannot calculate charts for current data" msgstr "No se pueden calcular gráficos para los datos actuales" @@ -1888,9 +1880,9 @@ msgstr "No se pueden calcular gráficos para los datos actuales" msgid "Select queue" msgstr "Seleccionar cola" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:582 -msgid "The cost category had already been removed." -msgstr "La categoría de coste ya había sido borrada." +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:173 +msgid "project name already being used" +msgstr "el nombre de proyecto ya está siendo usado" #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:48 msgid "Work description" @@ -1909,44 +1901,42 @@ msgstr "No hay ningún progreso asignado a la tarea actual" msgid "You can not remove the default scenario called \"{0}\"" msgstr "No se puede borrar el escenario por defecto, llamado \"{0}\"" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:106 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:205 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:224 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:185 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:162 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:184 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:192 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:165 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:88 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:209 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:220 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:158 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:180 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:188 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:161 msgid "direct link" msgstr "enlace directo" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:110 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:112 msgid "Down" msgstr "Abajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:934 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:842 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementFilterEnum.java:36 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:48 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:89 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:109 msgid "Label" msgstr "Etiqueta" -#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:37 -msgid "Create Scenario" -msgstr "Crear escenario" - -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:834 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:841 msgid "Value is not valid, taking into account the current list of HoursGroup" msgstr "" "El valor no es válido, teniendo en cuenta la lista actual de grupos de horas" -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:48 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:72 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:51 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:90 msgid "Association with roles" msgstr "Asociación con roles" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:384 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:371 msgid "missing type of work hours in a work report line" msgstr "falta el tipo de horas en una línea del parte de trabajo" @@ -1954,8 +1944,8 @@ msgstr "falta el tipo de horas en una línea del parte de trabajo" msgid "Quality forms" msgstr "Formularios de calidad" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:624 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:634 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:466 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:476 msgid "Repeated Hours Group code {0} in Project {1}" msgstr "Código {0} de grupo de horas repetido en proyecto {1}" @@ -1963,6 +1953,10 @@ msgstr "Código {0} de grupo de horas repetido en proyecto {1}" msgid "Hours group" msgstr "Grupo de horas" +#: libreplan-webapp/src/main/webapp/users/users.zul:23 +msgid "LibrePlan: Accounts" +msgstr "LibrePlan: Cuentas" + #: libreplan-webapp/src/main/webapp/templates/templates.zul:96 #: libreplan-webapp/src/main/webapp/templates/_list.zul:30 msgid "Days from Beginning to Deadline" @@ -1972,43 +1966,37 @@ msgstr "Días desde el comienzo hasta la fecha límite" msgid "Estimate At Completion" msgstr "Estimación de coste total actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:200 -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:421 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:373 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:194 -msgid "Delete item. Are you sure?" -msgstr "Borrar elemento. ¿Está seguro?" - #: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/ResourcesCostCategoryAssignment.java:102 msgid "cost assignment's start date not specified" msgstr "fecha de inicio de la asignación de coste no especificada" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:92 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:193 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:208 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:171 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:170 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:178 +#: 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/workingProgressPerTaskReport.zul:166 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:174 msgid "Output format:" msgstr "Formato de salida:" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1029 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1192 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:45 msgid "Direct" msgstr "Directo" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:818 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:189 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:268 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:289 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:828 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:104 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:193 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:245 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:266 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:34 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:52 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:83 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:51 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:86 msgid "Op." msgstr "Op." -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:55 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:51 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:51 msgid "Reference date:" msgstr "Fecha de referencia:" @@ -2016,11 +2004,11 @@ msgstr "Fecha de referencia:" msgid "Pessimistic" msgstr "Pesimista" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:373 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:376 msgid "Limiting resource assignation" msgstr "Asignación de recursos limitantes" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1235 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238 msgid "" "This progress can not be removed, because it is spread. It is necessary to " "select another progress as spread." @@ -2028,7 +2016,7 @@ msgstr "" "Este progreso no se puede eliminar porque es propagado. Es necesario " "seleccionar otro progreso como propagado." -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:116 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:119 msgid "Work week" msgstr "Semana de trabajo" @@ -2037,15 +2025,15 @@ msgid "You will lose the changes. Are you sure?" msgstr "Se perderán los cambios. ¿Está seguro?" #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:28 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:45 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:47 msgid "Company ID" msgstr "NIF" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:192 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:129 msgid "Unit type name cannot be empty" msgstr "El nombre del tipo de unidad no puede ser vacío" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:38 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:42 msgid "Entity sequences" msgstr "Secuencias de entidad" @@ -2054,15 +2042,19 @@ msgstr "Secuencias de entidad" msgid "Delay from beginning (days)" msgstr "Retraso desde el comienzo (en días)" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:319 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:324 msgid "Resource cannot be null" msgstr "El recurso no puede ser nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:505 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:453 msgid "Total Hours" msgstr "Horas totales" -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:366 +msgid "LibrePlan Role" +msgstr "Rol LibrePlan" + +#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:36 msgid "Create Progress Type" msgstr "Crear tipo de progreso" @@ -2070,12 +2062,8 @@ msgstr "Crear tipo de progreso" msgid "Confirm cancel" msgstr "Confirmar cancelación" -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:62 -msgid "Label list" -msgstr "Lista de etiquetas" - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:335 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:37 msgid "Work And Progress Per Task" msgstr "Trabajo y progreso por tarea" @@ -2083,70 +2071,69 @@ msgstr "Trabajo y progreso por tarea" msgid "WBS (tasks)" msgstr "EDT (tareas)" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1250 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:423 -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:133 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:299 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:538 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:552 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1234 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:455 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:300 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:465 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:150 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:227 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:310 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:859 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:894 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:262 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:207 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:835 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:870 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:264 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:208 msgid "Error on showing removing element: " msgstr "Error al mostrar el elemento a borrar: " -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:698 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:701 msgid "Deleting sequence" msgstr "Borrando secuencia" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:87 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:88 msgid "Select scenario" msgstr "Seleccionar escenario" -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:218 -msgid "Create Label Type" -msgstr "Crear tipo de etiqueta" +#: libreplan-webapp/src/main/webapp/settings/settings.zul:51 +msgid "Login" +msgstr "Nombre de usuario" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:233 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:225 msgid "missing work report code in a work report" msgstr "falta código en un parte de trabajo" -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36 -msgid "Create Work Report Type" -msgstr "Crear tipo de parte de trabajo" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:299 +msgid "Edit Virtual Workers Group: {0}" +msgstr "Editar grupo de trabajadores virtuales: {0}" #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51 msgid "Criterion requirement" msgstr "Criterios requeridos" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1245 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1404 msgid "Only the last activation period allows to delete end date." msgstr "Sólo el último periodo de activación permite borrar la fecha de fin." -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:329 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:189 +#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:63 +msgid "Maximum/minimum of worked hours in finished applications" +msgstr "Máximo/mínimo de las horas trabajadas en las aplicaciones finalizadas" + +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 msgid "Scheduling saved" msgstr "Planificación guardada" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:197 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:192 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:171 -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:27 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:68 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:28 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:70 msgid "Add new row" msgstr "Añadir nueva fila" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:782 -msgid "incorrect initialization of the progress assignment controller." -msgstr "inicialización incorrecta del controlador de asignación de progreso." - -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:488 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:492 msgid "Move" msgstr "Mover" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:67 +msgid "Password saved" +msgstr "Contraseña guardadaj" + #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:224 msgid "missing code in the resource calendar" msgstr "falta código en un calendario de recursos" @@ -2165,7 +2152,7 @@ msgstr "Histórico de asignación" msgid "CutycaptTimeout thread exception" msgstr "Excepción de thread CutycaptTimeout" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:22 msgid "Work Report Models" msgstr "Modelos de partes de trabajo" @@ -2178,11 +2165,15 @@ msgstr "Fecha de la última medida de progreso" msgid "Deadline (days since beggining project)" msgstr "Fecha límite (días desde el inicio del proyecto)" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:422 -msgid "number of hours is not properly calculated based on clock" -msgstr "número de horas no calculado correctamente basado en reloj" +#: libreplan-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:23 +msgid "LibrePlan: Companies" +msgstr "LibrePlan: Empresas" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:385 +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:22 +msgid "LibrePlan: Progress Report" +msgstr "LibrePlan: Informe de progreso" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:417 msgid "" "Calendar cannot be removed because it still has children. Some other " "calendar is derived from this one." @@ -2190,15 +2181,15 @@ msgstr "" "El calendario no se puede borrar porque aún tiene hijos. Algún otro " "calendario deriva de este." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:918 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:921 msgid "Value is not valid, the type must be not empty" msgstr "El valor no es válido, el tipo no debe ser vacío" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:444 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:445 msgid "criterion type name is already being used" msgstr "el nombre de tipo de criterio está siendo usado" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:331 msgid "Task code cannot be null" msgstr "El código de la tarea no puede ser nulo" @@ -2206,17 +2197,13 @@ msgstr "El código de la tarea no puede ser nulo" msgid "It is not allowed to consolidate progress." msgstr "No se permite consolidar progreso." -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:31 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32 msgid "Create Task" msgstr "Crear tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:98 -msgid "Error setting up creation form for Criterion Type" -msgstr "Error preparando el formulario de creación para un tipo de criterio" - -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:151 -msgid "Edit Cost Category" -msgstr "Editar categoría de coste" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 +msgid "LDAP Authentication enabled" +msgstr "Autenticación con LDAP activada" #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27 msgid "External company" @@ -2226,44 +2213,52 @@ msgstr "Empresa externa" #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:58 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:82 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:112 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:60 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:99 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:129 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:27 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68 msgid "Actions" msgstr "Acciones" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:115 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:118 msgid "Exceptions" msgstr "Excepciones" +#: libreplan-webapp/src/main/webapp/settings/settings.zul:32 +msgid "User settings" +msgstr "Preferencias de usuario" + #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:80 msgid "Start hour" msgstr "Hora de inicio" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:139 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:140 msgid "Assign materials" msgstr "Asignar materiales" -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:33 msgid "Over assignable" msgstr "Sobreasignable" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:226 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:231 msgid "format filters are not valid" msgstr "los filtros de formato no son válidos" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:29 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:37 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:72 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:76 msgid "ID" msgstr "NIF" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:419 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 +msgid "Settings" +msgstr "Preferencias" + +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:346 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:181 msgid "The init date cannot be empty" msgstr "La fecha de inicio no puede ser vacía" @@ -2272,20 +2267,20 @@ msgstr "La fecha de inicio no puede ser vacía" msgid "Is administrator" msgstr "Es administrador" -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:88 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:90 msgid "Our company password" msgstr "Contraseña de nuestra empresa" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:275 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:134 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:172 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:130 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:171 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:307 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:136 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:174 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:131 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:174 msgid "This label has already been added." msgstr "Esta etiqueta ya ha sido añadida." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java:79 -#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceServiceREST.java:179 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java:80 +#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceServiceREST.java:181 msgid "Could not get code, please try again later" msgstr "No se pudo obtener el código, por favor inténtelo de nuevo más tarde" @@ -2297,19 +2292,15 @@ msgstr "" "El valor no es válido.\n" " El código no puede contener caracteres como '_'." -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:625 -msgid "Confirm deleting this machine. Are you sure?" -msgstr "Confirmar el borrado de esta máquina. ¿Está seguro?" - #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:161 msgid "Hours Group" msgstr "Grupo de horas" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:915 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:823 msgid "Unallocated name" msgstr "Nombre no asignado" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:888 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:895 msgid "Move up" msgstr "Mover arriba" @@ -2322,10 +2313,10 @@ msgid "Subcontract communication date" msgstr "Fecha de comunicación de la subcontratación" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:281 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:262 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:354 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:129 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:132 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:263 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:359 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:131 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:134 msgid "Scheduling" msgstr "Planificación" @@ -2333,7 +2324,13 @@ msgstr "Planificación" msgid "Dependencies have priority" msgstr "Las dependencias tienen prioridad" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:206 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:516 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:901 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:126 +msgid "Create {0}" +msgstr "Crear {0}" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:218 msgid "Unlimited" msgstr "Ilimitado" @@ -2345,20 +2342,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/planner/company/CompanyPlanningModel.java:228 -msgid "Create new project" -msgstr "Crear nuevo proyecto" - -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:62 +#: 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/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:865 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:915 #: libreplan-webapp/src/main/webapp/orders/_list.zul:35 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:159 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 @@ -2370,38 +2368,30 @@ msgstr "Estado" msgid "Must start after" msgstr "Debe empezar después" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1345 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1306 msgid "Confirm change" msgstr "Confirmar cambio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:864 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:840 msgid "You don't have permissions to edit this project" msgstr "No tiene permisos para editar este proyecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:104 -msgid "Edit Profile" -msgstr "Editar perfil" - #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:192 msgid "missing date in a calendar exception" msgstr "falta la fecha de una excepción de calendario" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:432 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:213 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:440 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:145 msgid "" "Type of hours is empty. Please, create some type of hours before proceeding" msgstr "" "El tipo de horas está vacío. Por favor, crear algún tipo de horas antes de " "proceder" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:598 -msgid "Exception" -msgstr "Excepción" - #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:108 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:180 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:450 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:515 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:172 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:437 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:502 msgid "There is no resource with this ID" msgstr "No hay otro recurso con este NIF" @@ -2410,15 +2400,19 @@ msgstr "No hay otro recurso con este NIF" msgid "Send" msgstr "Enviar" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:103 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:104 msgid "user" msgstr "usuario" +#: libreplan-webapp/src/main/webapp/materials/materials.zul:21 +msgid "LibrePlan: Materials" +msgstr "LibrePlan: Materiales" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeModel.java:53 msgid "New task" msgstr "Nueva tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:132 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:192 msgid "The password for a new user cannot be empty" msgstr "La contraseña no puede ser vacía para un usuario nuevo" @@ -2430,23 +2424,19 @@ msgstr "Usuario asociado" msgid "Type name" msgstr "Nombre del tipo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69 -msgid "Progress assignment" -msgstr "Asignación de progreso" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:31 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:182 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:181 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:205 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:440 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:687 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:27 msgid "All" msgstr "Todo" -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:40 -msgid "Edit Progress Type" -msgstr "Editar tipo de progreso" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69 +msgid "Progress assignment" +msgstr "Asignación de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:459 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:463 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:77 msgid "Manual" msgstr "Manual" @@ -2458,11 +2448,11 @@ msgstr "Lista de calendarios" msgid "Receipt date" msgstr "Fecha de recepción" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:210 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:209 msgid "Cannot be higher than Ending date" msgstr "No puede ser mayor que la fecha de fin" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:292 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:269 msgid "Create activation period" msgstr "Crear período de activación" @@ -2474,9 +2464,9 @@ msgstr "Lista de trabajadores" msgid "Personal details" msgstr "Detalles personales" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1027 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1190 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:48 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:214 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:217 msgid "Inherited" msgstr "Heredado" @@ -2484,12 +2474,8 @@ msgstr "Heredado" msgid "Delete project template. Are you sure?" msgstr "Borrar plantilla de proyecto. ¿Está seguro?" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:255 -msgid "Worker" -msgstr "Trabajador" - -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:517 -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:595 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:521 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:599 msgid "" "Cannot allocate selected element. There is not any queue that matches " "resource allocation criteria at any interval of time" @@ -2498,16 +2484,21 @@ msgstr "" "coincida con los criterios de asignación de recursos en ningún intervalo de " "tiempo" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:890 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:287 +msgid "Worker" +msgstr "Trabajador" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java:217 msgid "Criterion must be not-null" msgstr "El criterio no debe ser nulo" #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:161 -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:299 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:300 msgid "criterion name not specified" msgstr "nombre del criterio no especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:136 +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:95 msgid "Value is not valid, the default max value must not be empty " msgstr "El valor no es válido, el valor máximo por defecto no debe ser nulo " @@ -2528,15 +2519,19 @@ msgstr "Autorizar" msgid "Recommended allocation" msgstr "Asignación recomendada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:303 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:241 +msgid "Activation" +msgstr "Activación" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304 msgid "Scenarios" msgstr "Escenarios" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:375 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:376 msgid "Materials saved" msgstr "Materiales guardados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1249 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1252 msgid "" "This progress measurement can not be in current date, because it is " "consolidated. it is necessary to select other date." @@ -2544,15 +2539,24 @@ msgstr "" "Esta medida de progreso no puede estar en la fecha actual, porque está " "consolidada. Debe seleccionar otra fecha." -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:705 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:334 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:37 +msgid "Total Worked Hours By Resource In A Month" +msgstr "Total horas trabajadas por recurso en un mes" + +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:672 msgid "Other projects" msgstr "Otros proyectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:159 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:111 +msgid "Tasks input buffer" +msgstr "Buffer de tareas de entrada" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:168 msgid "At least one {0} sequence must be active" msgstr "Al menos una secuencia de {0} debe estar activa" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:111 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:26 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 @@ -2571,15 +2575,19 @@ msgstr "Deshabilitar borrado" msgid "You should select a source scenario" msgstr "Debe seleccionar un escenario de origen" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:154 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:163 msgid "At least one {0} sequence is needed" msgstr "Se necesita al menos una secuencia de {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:37 msgid "Estimated/Planned Hours Per Task" msgstr "Horas por tarea estimadas/planificadas" +#: libreplan-webapp/src/main/webapp/costcategories/costCategory.zul:23 +msgid "LibrePlan: Cost Categories" +msgstr "LibrePlan: Categorías de coste" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/TwoWaySelector.java:68 msgid "Assigned" msgstr "Asignado" @@ -2588,11 +2596,15 @@ msgstr "Asignado" msgid "Details" msgstr "Detalles" +#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:21 +msgid "LibrePlan: Units" +msgstr "LibrePlan: Unidades" + #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 msgid "Communication" msgstr "Comunicación" -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:35 +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:36 msgid "More options" msgstr "Más opciones" @@ -2601,15 +2613,11 @@ msgstr "Más opciones" msgid "Error: {0}" msgstr "Error: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:185 -msgid "Company saved" -msgstr "Empresa guardada" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:240 msgid "Confirm create template" msgstr "Confirmar la creación de la plantilla" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:261 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:238 msgid "Parent" msgstr "Padre" @@ -2617,38 +2625,43 @@ msgstr "Padre" msgid "Earliest date" msgstr "Fecha más temprana" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:126 -msgid "Type of work hours saved" -msgstr "Tipo de horas de trabajo guardado" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 +msgid "Change Password" +msgstr "Cambiar la contraseña" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:269 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:113 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:46 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21 +msgid "LibrePlan: Work And Progress Per Task" +msgstr "LibrePlan: trabajo y progreso por tarea" + +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:48 msgid "Projects" msgstr "Proyectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:150 -msgid "Create Quality Form" -msgstr "Crear formulario de calidad" - #: libreplan-webapp/src/main/java/org/libreplan/web/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:264 +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" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:72 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:46 msgid "December" msgstr "Diciembre" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:922 +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:35 +msgid "Change password" +msgstr "Cambiar la contraseña" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:830 msgid "Text field" msgstr "Campo de texto" -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:122 +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:81 msgid "" "Value is not valid, the Precision value must be less than the defalt max " "value." @@ -2656,11 +2669,11 @@ msgstr "" "El valor no es válido, el valor de precisión debe ser menor que el valor " "máximo por defecto." -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:181 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:97 msgid "Question" msgstr "Pregunta" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1246 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1249 msgid "" "This progress measurement can not be changed or removed, because it is " "consolidated. It is needed to remove its consolidation." @@ -2668,17 +2681,18 @@ msgstr "" "Esta medida de progreso no se puede cambiar o borrar, porque está " "consolidada. Se requiere borrar su consolidación." -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:222 +#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:23 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:225 msgid "Create new work week" msgstr "Crear nueva semana de trabajo" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:134 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:137 msgid "The admin's account password remains the default one. This is unsecure" msgstr "" "La contraseña de la cuenta de admin sigue siendo la contraseña por defecto. " "Esto no es seguro" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:713 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:716 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:34 msgid "LIMITING RESOURCE" msgstr "RECURSO LIMITANTE" @@ -2687,7 +2701,7 @@ msgstr "RECURSO LIMITANTE" msgid "Subcontratation" msgstr "Subcontratación" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:198 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:135 msgid "" "The meausure name is not valid. There is another unit type with the same " "measure name" @@ -2695,24 +2709,20 @@ msgstr "" "El nombre de la medida no es válido. Hay otro tipo de unidad con el mismo " "nombre de medida" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:535 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:590 msgid "{0} cannot be fulfilled" msgstr "No se puede cumplir {0}" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:68 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:69 msgid "Extended view" msgstr "Vista expandida" -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:33 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:34 msgid "Work record" msgstr "Registro de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:116 -msgid "Error setting up edition form." -msgstr "Error preparando el formulario de edición." - -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:149 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:151 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:145 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:147 msgid "Output format" msgstr "Formato de salida" @@ -2720,14 +2730,6 @@ msgstr "Formato de salida" msgid "Print" msgstr "Imprimir" -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:22 -msgid "LibrePlan: Calendars" -msgstr "LibrePlan: Calendarios" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:412 -msgid "Hours cannot be null" -msgstr "Las horas no pueden ser nulas" - #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java:179 msgid "{0} not found type for criterion " msgstr "{0} no encontrado tipo para criterio " @@ -2736,56 +2738,53 @@ msgstr "{0} no encontrado tipo para criterio " msgid "Page down" msgstr "Página abajo" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:485 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:486 msgid "resource type does not allow enabled criteria" msgstr "el tipo de recurso no permite criterios habilitados" -#: libreplan-webapp/src/main/webapp/common/event_error.zul:22 -#: libreplan-webapp/src/main/webapp/common/error.zul:21 -msgid "LibrePlan: Runtime Error" -msgstr "LibrePlan: Error de ejecución" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:416 +msgid "Effort cannot be null" +msgstr "El esfuerzo no puede ser nulo" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:52 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:39 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:43 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:217 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1015 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:38 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:211 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:191 -#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:34 -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:49 -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:55 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:101 +#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:58 +#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:47 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:103 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:49 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:92 -#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:46 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:94 +#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:45 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:41 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:136 -#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:40 -#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:44 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:87 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:77 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:84 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:139 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:81 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:141 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:134 -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:99 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:243 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:138 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:70 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:80 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:85 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:88 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:142 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:139 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:100 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:379 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:50 -#: libreplan-webapp/src/main/webapp/planner/order.zul:72 -#: libreplan-webapp/src/main/webapp/planner/order.zul:135 -#: libreplan-webapp/src/main/webapp/planner/order.zul:170 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:85 -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:41 +#: libreplan-webapp/src/main/webapp/planner/order.zul:73 +#: libreplan-webapp/src/main/webapp/planner/order.zul:134 +#: libreplan-webapp/src/main/webapp/planner/order.zul:169 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:91 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:81 msgid "Cancel" msgstr "Cancelar" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:32 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:35 msgid "General user data" msgstr "Datos generales de usuario" @@ -2797,7 +2796,7 @@ msgstr "Quitar planificación" msgid "Subcontracted task sent successfully" msgstr "Tarea subcontratada enviada con éxito" -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:73 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:77 msgid "Accumulated hours chart" msgstr "Gráfico de horas acumuladas" @@ -2809,13 +2808,13 @@ msgstr "Lista de máquinas" msgid "CPI" msgstr "CPI" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:660 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:923 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:526 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:687 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:318 msgid "You don't have read access to this project" msgstr "No tiene acceso de lectura a este proyecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:180 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:96 msgid "" "Disable hierarchy will cause criteria tree to be flattened. Are you sure?" msgstr "" @@ -2828,17 +2827,13 @@ msgstr "" msgid "Units" msgstr "Unidades" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:45 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:52 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:47 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:41 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:48 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:43 msgid "Dates" msgstr "Fechas" -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:45 -msgid "Create Calendar" -msgstr "Crear calendario" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:185 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:168 msgid "At least one stretch is needed" msgstr "Se necesita al menos un tramo" @@ -2846,10 +2841,22 @@ msgstr "Se necesita al menos un tramo" msgid "a day is not valid" msgstr "un día no es válido" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:87 +msgid "Autocomplete login form" +msgstr "Autocompletar el formulario de inicio de sesión" + +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21 +msgid "LibrePlan: Project Costs Per Resource" +msgstr "LibrePlan: costes de proyecto por recurso" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesCommand.java:61 msgid "Task Properties" msgstr "Propiedades de la tarea" +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21 +msgid "LibrePlan: Task Scheduling Status In Project" +msgstr "LibrePlan: Estado de planificación en proyecto" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:229 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:237 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:214 @@ -2859,20 +2866,11 @@ msgstr "" "Fecha de fin inválida, la fecha de fin nueva debe ser posterior a la fecha " "de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:192 -msgid "Cost category saved" -msgstr "Categoría de coste guardada" - #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27 -#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:33 msgid "name" msgstr "nombre" -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:170 -msgid "Progress type saved" -msgstr "Tipo de progreso guardado" - -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:73 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:75 msgid "Delete selected task" msgstr "Borrar tarea seleccionada" @@ -2880,10 +2878,14 @@ msgstr "Borrar tarea seleccionada" msgid "{0} (max: {1})" msgstr "{0} (máx: {1})" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:459 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:470 msgid "end" msgstr "fin" +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:529 +msgid "Cost Category" +msgstr "Categoría de coste" + #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:63 msgid "Log" msgstr "Diario" @@ -2906,7 +2908,7 @@ msgstr "Editar tarea {0}" msgid "Start date cannot be null" msgstr "La fecha de inicio no puede ser nula" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:297 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298 msgid "Subcontracting" msgstr "Subcontratación" @@ -2914,7 +2916,7 @@ msgstr "Subcontratación" msgid "references" msgstr "referencias" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1284 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1278 msgid "Value is not valid, the Precision value must be exact " msgstr "El valor no es válido, el valor de precisión debe ser exacto " @@ -2926,7 +2928,11 @@ msgstr "Genérico" msgid "Planned workable days :" msgstr "Días laborables planificados :" -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:47 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:51 +msgid "Template" +msgstr "Plantilla" + +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:49 msgid "Default max value" msgstr "Valor máximo por defecto" @@ -2934,7 +2940,7 @@ msgstr "Valor máximo por defecto" msgid "Add criterion requirement" msgstr "Añadir criterio requerido" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:879 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:855 msgid "" "You can not remove the project \"{0}\" because of any of its tasks are " "already in use in some work reports and the project just exists in the " @@ -2952,13 +2958,14 @@ msgstr "Porcentaje de horas de presupuesto estimadas / horas consumidas" msgid "Criterion Name" msgstr "Nombre del criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:498 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:502 msgid "Automatic" msgstr "Automático" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:91 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:93 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:133 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48 msgid "Task" msgstr "Tarea" @@ -2967,20 +2974,28 @@ msgstr "Tarea" msgid "Planned end :" msgstr "Fin planificado :" +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:21 +msgid "LibrePlan: Change password" +msgstr "LibrePlan: Cambiar la contraseña" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:85 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:270 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:128 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:167 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:124 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:165 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:302 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:130 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:169 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:125 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:168 msgid "please, select a label" msgstr "por favor, seleccione una etiqueta" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:106 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:123 msgid "Add profile" msgstr "Añadir perfil" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:215 +#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:23 +msgid "LibrePlan: Scenarios Management" +msgstr "LibrePlan: Gestión de Escenarios" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:220 msgid "filter already exists" msgstr "el filtro ya existe" @@ -2998,6 +3013,10 @@ msgstr "Nombre del criterio" msgid "values are not valid, the values must not be null" msgstr "los valores no son válidos, no deben ser nulos" +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:41 +msgid "Apply changes and go back to scheduling" +msgstr "Aplicar cambios y volver a la planificación" + #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:78 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:32 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50 @@ -3010,9 +3029,9 @@ msgstr "recurso de la asignación de coste no especificado" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:127 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:135 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:68 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:49 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:132 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45 #: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderTemplate.java:73 msgid "Project" msgstr "Proyecto" @@ -3021,11 +3040,7 @@ msgstr "Proyecto" msgid "Unassigned" msgstr "No asignado" -#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:25 -msgid "Select the date from which the new version will be valid" -msgstr "Seleccione la fecha a partir de la cual la versión nueva será válida" - -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:101 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:102 msgid "Add new criterion requirement" msgstr "Añadir nuevo criterio requerido" @@ -3033,11 +3048,11 @@ msgstr "Añadir nuevo criterio requerido" msgid "Budgeted Cost Work Performed" msgstr "Coste presupuestado del trabajo realizado" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:135 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:138 msgid "Change the password" msgstr "Cambiar la contraseña" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:95 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:115 msgid "Work report" msgstr "Parte de trabajo" @@ -3045,24 +3060,29 @@ msgstr "Parte de trabajo" msgid "the name must be not empty" msgstr "el nombre no puede ser vacío" -#: libreplan-webapp/src/main/webapp/materials/materials.zul:86 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:58 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:85 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:71 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:27 msgid "Disabled" msgstr "Deshabilitado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:731 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:347 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:701 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:326 msgid "Earned value" msgstr "Valor ganado" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:216 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:151 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35 +msgid "Overtime Effort" +msgstr "Esfuerzo extra" + +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:219 msgid "Inherited from parent calendar" msgstr "Heredado del calendario padre" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:146 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:184 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:210 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:149 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:187 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:213 msgid "Normal Effort" msgstr "Esfuerzo normal" @@ -3080,51 +3100,48 @@ msgstr "" "intentando crear unha plantilla a partir de una tarea nueva.\n" "Por favor guarde su proyecto antes de continuar." -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:92 -msgid "Edit Work Hours Type" -msgstr "Editar tipo de horas de trabajo" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:43 -msgid "From Today" -msgstr "A partir de hoy" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1060 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1075 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1114 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1129 msgid "{0} not supported yet" msgstr "{0} aún no soportado" +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:143 +msgid "is not supported for its use with LibrePlan." +msgstr "no está soportado para su uso con LibrePlan." + #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:53 msgid "New entry" msgstr "Entrada nueva" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:211 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:220 msgid "Some sequences to remove not existed" msgstr "Algunas secuencias para borrar no existen" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:105 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:114 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:212 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:100 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:109 msgid "Resources Load" msgstr "Carga de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:211 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:214 msgid "Changes have been canceled" msgstr "Cambios cancelados" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:266 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:281 -msgid "Machine saved" -msgstr "Máquina guardada" +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:21 +msgid "LibrePlan: Hours Worked Per Worker In A Month" +msgstr "LibrePlan: Horas trabajadas por trabajador en un mes" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:143 -msgid "Create Cost Category" -msgstr "Crear categoría de coste" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:297 +msgid "Authentication" +msgstr "Autenticación" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:63 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "March" msgstr "Marzo" +#: libreplan-webapp/src/main/webapp/settings/settings.zul:85 +msgid "Select language" +msgstr "Seleccionar idioma" + #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:104 msgid "Appropriative allocation" msgstr "Asignación apropiativa" @@ -3133,11 +3150,11 @@ msgstr "Asignación apropiativa" msgid "Assigned criterion requirements" msgstr "Criterios requeridos asignados" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:140 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:157 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:119 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:119 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:127 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:144 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:153 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:115 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:115 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:123 msgid "Filter by criteria" msgstr "Filtrar por criterios" @@ -3150,11 +3167,11 @@ msgstr "Valor máximo" msgid "Scenarios List" msgstr "Lista de escenarios" -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:156 +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:115 msgid "The name is not valid, the name must not be null " msgstr "El nombre no es válido, no debe ser nulo " -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:139 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136 msgid "Hours to allocate" msgstr "Horas para asignar" @@ -3162,7 +3179,7 @@ msgstr "Horas para asignar" msgid "A category must be selected" msgstr "Debe seleccionar una categoría" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:134 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:137 msgid "Period" msgstr "Periodo" @@ -3175,91 +3192,84 @@ msgstr "Propagación" msgid "Select start date" msgstr "Seleccionar fecha de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:188 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:214 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:877 +msgid "Removed {0}" +msgstr "{0} borrado" + +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:106 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:152 msgid "Error on showing warning message removing typeOfWorkHours: " msgstr "" "Error al mostrar mensaje de advertencia borrando tipo de horas de trabajo: " -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:153 -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:151 -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:189 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:901 -msgid "Removed {0}" -msgstr "{0} borrado" - -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:818 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821 msgid "Confirm deleting this worker. Are you sure?" msgstr "Confirmar el borrado de este trabajador. ¿Está seguro?" -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:62 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:64 msgid "Group name" msgstr "Nombre del grupo" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:51 msgid "Start date:" msgstr "Fecha de inicio:" -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:57 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:81 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:59 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:98 msgid "Role name" msgstr "Nombre del rol" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:837 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:840 msgid "This worker was already removed by other user" msgstr "Este trabajador ya ha sido borrado por otro usuario" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:611 -msgid "Create Work Report" -msgstr "Crear parte de trabajo" - -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:116 -msgid "Value is not valid, the precision value must not be empty" -msgstr "El valor no es válido, el valor de precisión no debe ser vacío" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:821 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:484 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:791 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:474 msgid "h" msgstr "h" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:359 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:620 +msgid "Create Work Report" +msgstr "Crear parte de trabajo" + +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:75 +msgid "Value is not valid, the precision value must not be empty" +msgstr "El valor no es válido, el valor de precisión no debe ser vacío" + +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:363 msgid "Workable capacity for this period " msgstr "Capacidad de trabajo para este período " -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:218 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:150 #: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:159 msgid "Cannot be null or empty" msgstr "No puede ser nulo o vacío" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:190 -msgid "Cannot delete profile: it does not exist anymore" -msgstr "No se puede borrar el perfil: ya no existe" +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:440 +msgid "Quality Form" +msgstr "Formulario de calidad" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:225 -msgid "Edit Machine" -msgstr "Editar máquina" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:77 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:67 msgid "Add Milestone" msgstr "Añadir hito" -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:119 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:116 msgid "Assign selected items" msgstr "Asignar elementos seleccionados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:438 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:449 msgid "init" msgstr "inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1212 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1215 msgid "Add new progress measurement" msgstr "Añadir nueva medida de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:528 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:532 msgid "Select for automatic queuing" msgstr "Seleccione para encolar automáticamente" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 msgid "Scenarios Management" msgstr "Administración de escenarios" @@ -3271,86 +3281,96 @@ msgstr "Proyecto {0} transferido" msgid "Create & Assign" msgstr "Crear y asignar" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:148 -msgid "Edit User" -msgstr "Editar usuario" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1549 +msgid "Not configurable" +msgstr "No configurable" -#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:55 -msgid "Maximum/minimum of the estimated hours" -msgstr "Máximo/mínimo de las horas estimadas" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationCommand.java:47 +msgid "Advanced allocation" +msgstr "Asignación avanzada" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:753 -msgid "D" -msgstr "D" - -#: libreplan-webapp/src/main/webapp/planner/order.zul:112 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:90 +#: libreplan-webapp/src/main/webapp/planner/order.zul:111 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:93 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:96 msgid "Consolidated" msgstr "Consolidado" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:125 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:145 msgid "Work report types" msgstr "Tipos de partes de trabajo" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:182 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:174 msgid "MonteCarlo method" msgstr "Método de Montecarlo" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1057 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1220 msgid "derived exception can not be removed" msgstr "la excepción derivada no se puede borrar" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:287 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:307 +msgid "Edit Worker: {0}" +msgstr "Editar trabajador: {0}" + #: libreplan-webapp/src/main/java/org/libreplan/ws/materials/impl/MaterialConverter.java:217 msgid "missing code in a material" msgstr "falta el código en un material" +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:21 +msgid "LibrePlan: User access" +msgstr "LibrePlan: Acceso de usuarios" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:61 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:67 #: libreplan-webapp/src/main/webapp/orders/_list.zul:32 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:109 msgid "Customer" msgstr "Cliente" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:810 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:820 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:86 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 msgid "Hours type" msgstr "Tipo de horas" #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:156 -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:210 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:211 msgid "criterion type name not specified" msgstr "nombre del tipo de criterio no especificado" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:246 +msgid "Cannot connect to LDAP server" +msgstr "No se puede conectar al servidor de LDAP" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:220 msgid "Add Exception" msgstr "Añadir excepción" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:405 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:427 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:451 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:301 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:322 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:346 msgid "cannot be empty" msgstr "no puede ser vacío" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1468 -msgid "Sigmoid function" -msgstr "Función sigmoide" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:421 +msgid "Effort must be greater than zero" +msgstr "El esfuerzo debe ser mayor que cero" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:49 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:48 -#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:27 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:47 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:40 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:27 msgid "from" msgstr "desde" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:147 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:146 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:121 msgid "Heading Fields" msgstr "Campos de cabecera" -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:74 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:84 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:70 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:80 msgid "Progress type" msgstr "Tipo de progreso" @@ -3370,7 +3390,7 @@ msgstr "" "El período de tiempo contiene datos inválidos. La fecha de fin debe ser " "mayor que la de inicio" -#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:43 +#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:33 msgid "Save Project" msgstr "Guardar proyecto" @@ -3379,8 +3399,8 @@ msgstr "Guardar proyecto" msgid "Day is not valid" msgstr "El día no es válido" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:627 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1097 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:619 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1256 msgid "You should select a start date for the exception" msgstr "Debe seleccionar una fecha de inicio para la excepción" @@ -3396,6 +3416,10 @@ msgstr "Desviación al coste final" msgid "Exportation options" msgstr "Opciones de exportación" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java:92 +msgid "Settings saved" +msgstr "Preferencias guardadas" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:160 msgid "" "Could not save time period. Time period overlaps with another non-compatible " @@ -3404,83 +3428,83 @@ msgstr "" "No se pudo guardar el período de tiempo. El período se solapa con otro " "período de tiempo incompatible" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:375 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:376 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ScenarioBandboxFinder.java:46 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/BaseCalendarBandboxFinder.java:46 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:493 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:978 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:88 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:441 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:94 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:42 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:43 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:156 -#: libreplan-webapp/src/main/webapp/calendars/_list.zul:27 +#: libreplan-webapp/src/main/webapp/calendars/_list.zul:28 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:40 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:31 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:52 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:55 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:56 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:35 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:27 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:45 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:25 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:38 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:39 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:91 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:90 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:26 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:41 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:74 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:42 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77 #: libreplan-webapp/src/main/webapp/materials/materials.zul:58 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:41 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:82 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:42 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:84 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:67 -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:77 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:76 #: libreplan-webapp/src/main/webapp/scenarios/_list.zul:27 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:31 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:50 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:49 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:30 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:51 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:50 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:39 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:32 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:52 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:50 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:52 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:51 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:40 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:35 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:115 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 #: libreplan-webapp/src/main/webapp/orders/_list.zul:28 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:72 #: libreplan-webapp/src/main/webapp/templates/templates.zul:80 #: libreplan-webapp/src/main/webapp/templates/_list.zul:27 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:80 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:32 #: libreplan-webapp/src/main/webapp/planner/main.zul:49 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:89 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:120 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:162 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:138 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:179 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:100 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:141 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:98 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:100 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:141 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:108 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:149 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:85 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:124 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:166 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:90 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:134 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:175 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:96 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:94 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:96 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:137 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:104 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:145 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:115 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:45 msgid "Name" msgstr "Nombre" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:162 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:168 msgid "Delete task" msgstr "Borrar tarea" @@ -3492,11 +3516,11 @@ msgstr "Segundos" msgid "please, select an item" msgstr "por favor, seleccione un elemento" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:392 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:397 msgid "Time Start cannot be null" msgstr "La hora de inicio no puede ser nula" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:208 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:212 msgid "Day of week" msgstr "Día de la semana" @@ -3504,12 +3528,12 @@ msgstr "Día de la semana" msgid "Companies List" msgstr "Lista de empresas" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1443 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1453 msgid "Stretches with Interpolation" msgstr "Tramos con interpolación" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:333 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:37 msgid "Hours Worked Per Resource" msgstr "Horas trabajadas por recurso" @@ -3521,19 +3545,20 @@ msgstr "La fecha de fin no puede ser anterior a la fecha de inicio" msgid "cost assignment with end date less than start date" msgstr "la asignación de coste tiene fecha de fin anterior a la de inicio" -#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:63 -msgid "Maximum/minimum of the worked hours" -msgstr "Máximo/mínimo de las horas trabajadas" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:91 +msgid "" +"Enable/Disable autocomplete property in login form, if the admin password is " +"still in default" +msgstr "" +"Habilitar/Deshabilitar la propiedad de autocompletado en el formulario de " +"inicio de sesión, si la contraseña de admin tovadía es la contraseña por " +"defecto" -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:35 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26 msgid "Category name" msgstr "Nombre de la categoría" -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21 -msgid "LibrePlan: Work And Progress Per Task" -msgstr "LibrePlan: trabajo y progreso por tarea" - #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:766 msgid "Not the same material, impossible to update" msgstr "No es el mismo material, imposible actualizar" @@ -3542,10 +3567,6 @@ msgstr "No es el mismo material, imposible actualizar" msgid "Main menu" msgstr "Menú principal" -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:22 -msgid "LibrePlan: Progress" -msgstr "LibrePlan: Progreso" - #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:31 msgid "MonteCarlo" msgstr "Montecarlo" @@ -3554,15 +3575,23 @@ msgstr "Montecarlo" msgid "Duration" msgstr "Duración" -#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:39 -msgid "Create From Template" -msgstr "Crear a partir de plantilla" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:585 +msgid "Exception: {0}" +msgstr "Excepción: {0}" + +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:46 +msgid "Password settings" +msgstr "Configuración de la contraseña" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:381 msgid "There exists other workReportType with the same name." msgstr "Ya existe otro tipo de parte de trabajo con el mismo nombre." -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:150 +#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:22 +msgid "LibrePlan: Progress" +msgstr "LibrePlan: Progreso" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:149 #: libreplan-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:29 msgid "Schedule" msgstr "Planificar" @@ -3581,45 +3610,41 @@ msgstr "Inesperado: {0}" msgid "Notes" msgstr "Notas" -#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:224 +#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:178 msgid "Connect" msgstr "Conectar" -#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:21 -msgid "LibrePlan: Units" -msgstr "LibrePlan: Unidades" - -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:23 -msgid "LibrePlan: Transfer Projects Between Scenarios" -msgstr "LibrePlan: transferir proyectos entre escenarios" - -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:221 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:223 msgid "Allocation: [{0},{1}]" msgstr "Asignación: [{0},{1}]" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:194 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:892 +msgid "Virtual Workers Group" +msgstr "Grupo de trabajadores virtuales" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:198 msgid "Changes saved" msgstr "Cambios guardados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1281 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1258 msgid "See scheduling" msgstr "Ver planificación" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:338 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:341 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:107 msgid "Progress measurements" msgstr "Medidas de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1211 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1214 msgid "Add measure" msgstr "Añadir medida" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:253 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:258 msgid "Work report saved" msgstr "Parte de trabajo guardado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractCommand.java:52 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:374 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractCommand.java:53 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:377 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:68 msgid "Subcontract" msgstr "Subcontratar" @@ -3639,7 +3664,7 @@ msgstr "Relación" msgid "End" msgstr "Fin" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1366 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1360 msgid "The date is not valid, the date must be not empty" msgstr "La fecha no es válida, no debe ser vacía" @@ -3647,26 +3672,30 @@ msgstr "La fecha no es válida, no debe ser vacía" msgid "User login name" msgstr "Nombre de usuario" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:534 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318 msgid "Cost Categories" msgstr "Categorías de coste" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:312 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:313 msgid "criterion type not specified" msgstr "tipo de criterio no especificado" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:343 +msgid "Role property:" +msgstr "Propiedad del rol:" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignController.java:143 msgid "must be not empty" msgstr "no puede ser vacío" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "April" msgstr "Abril" -#: libreplan-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:23 -msgid "LibrePlan: Companies" -msgstr "LibrePlan: Empresas" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:301 +msgid "Derived of Calendar " +msgstr "Derivado del calendario " #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:22 msgid "Users List" @@ -3678,16 +3707,20 @@ msgstr "Lista de usuarios" msgid "Task quality forms" msgstr "Formularios de calidad de tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:600 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:593 msgid "Not working day" msgstr "Día no laborable" +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:237 +msgid "Progress Types" +msgstr "Tipos de progreso" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnum.java:29 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:135 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:155 msgid "Cost category" msgstr "Categoría de coste" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:697 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:700 msgid "It can not be deleted. At least one sequence is necessary." msgstr "No se puede borrar. Al menos una secuencia es necesaria." @@ -3695,23 +3728,29 @@ msgstr "No se puede borrar. Al menos una secuencia es necesaria." msgid "Resource allocation" msgstr "Asignación de recursos" -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:51 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:50 msgid "Amount work" msgstr "Cantidad de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:171 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:172 msgid "please, select a quality form" msgstr "por favor, seleccione un formulario de calidad" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:201 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:195 msgid "Select entity:" msgstr "Seleccione entidad:" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:522 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:907 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:132 +msgid "Edit {0}: {1}" +msgstr "Editar {0}: {1}" + #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:400 msgid "Exist other workReportType with the same code." msgstr "Ya existe otro tipo de parte de trabajo con el mismo código." -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:65 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:67 msgid "Unindent selected task" msgstr "Desindentar tarea seleccionada" @@ -3723,20 +3762,11 @@ msgstr "Código de referencia del cliente" msgid "Constraint" msgstr "Restricción" -#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:155 -msgid "Create Exception Day Type" -msgstr "Crear tipo de día de excepción" - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:333 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:41 -msgid "Hours Worked Per Resource In A Month" -msgstr "Horas trabajadas por recurso en un mes" - #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150 msgid "Add New Label Type Field" msgstr "Añadir nuevo campo de tipo de etiqueta" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:402 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:407 msgid "Time finish cannot be null" msgstr "La hora de fin no puede ser nula" @@ -3744,23 +3774,22 @@ msgstr "La hora de fin no puede ser nula" msgid "Customer reference" msgstr "Referencia de cliente" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:329 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:661 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:740 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:865 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:915 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:924 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:947 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:145 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:189 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:461 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:759 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:517 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:527 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:688 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:841 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:891 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:900 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:927 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:146 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:360 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:309 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:319 msgid "Information" msgstr "Información" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:946 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:926 msgid "Sorry, you do not have permissions to access this project" msgstr "Lo sentimos, no tiene permisos para acceder a este proyecto" @@ -3768,11 +3797,11 @@ msgstr "Lo sentimos, no tiene permisos para acceder a este proyecto" msgid "END" msgstr "FIN" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:223 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:226 msgid "Worker saved" msgstr "Trabajador guardado" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:261 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:266 msgid "can not pass until the previous item is passed." msgstr "no se puede pasar mientras el elemento no anterior sea pasado." @@ -3780,11 +3809,7 @@ msgstr "no se puede pasar mientras el elemento no anterior sea pasado." msgid "New hours group " msgstr "Nuevo grupo de horas " -#: libreplan-webapp/src/main/webapp/qualityforms/qualityForms.zul:22 -msgid "LibrePlan: Quality Forms" -msgstr "LibrePlan: Formularios de calidad" - -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:460 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:464 msgid "Assign element to queue manually" msgstr "Asignar elemento a cola manualmente" @@ -3792,15 +3817,15 @@ msgstr "Asignar elemento a cola manualmente" msgid "Edit Template" msgstr "Editar Plantilla" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:216 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:218 msgid "Resource: {0} " msgstr "Recurso: {0} " -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:463 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:358 msgid "percentage cannot be duplicated" msgstr "el porcentaje no puede estar duplicado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 msgid "Work Hours" msgstr "Horas de trabajo" @@ -3808,7 +3833,7 @@ msgstr "Horas de trabajo" msgid "Heading" msgstr "Cabecera" -#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:164 +#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:165 msgid "Company ID already used. It has to be be unique" msgstr "NIF de la empresa ya está siendo usado. Debe ser único" @@ -3820,23 +3845,20 @@ msgstr "No hay ninguna categoría de materiales con este código" msgid "Percentages should sum 100" msgstr "Los porcentajes debería sumar 100" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:284 -msgid "Could not save machine" -msgstr "No se pudo guardar la máquina" - #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:339 msgid "The calendar exception type not found" msgstr "Tipo de excepción de calendario no encontrado" #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/ResourceEnumConverter.java:81 +#: libreplan-webapp/src/main/java/org/libreplan/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java:106 msgid "Unable to convert value to {0} type" msgstr "No se pudo convertir el valor a tipo {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:220 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:223 msgid "Worker must be not-null" msgstr "El trabajador no debe ser nulo" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1067 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1063 msgid "Some criterion satisfactions overlap in time" msgstr "Algunos criterios satisfechos se solapan en el tiempo" @@ -3844,34 +3866,43 @@ msgstr "Algunos criterios satisfechos se solapan en el tiempo" msgid "Value last progress measurement" msgstr "Valor última medida de progreso" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:43 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 +msgid "LibrePlan: Materials Needs At Date" +msgstr "LibrePlan: Necesidad de materiales en fecha" + +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44 msgid "Worker assignments" msgstr "Asignaciones de trabajador" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:541 -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:402 -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:147 -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:174 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:610 +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:270 +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:154 +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:182 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java:173 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:409 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:431 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:305 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:326 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:221 msgid "{0} already exists" msgstr "{0} ya existe" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:314 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:318 msgid "Create Worker" msgstr "Crear trabajador" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:587 +msgid "Exception: {0} (Inh)" +msgstr "Excepción: {0} (Her)" + #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:38 msgid "Code " msgstr "Código" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:52 +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:66 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:65 msgid "Password confirmation" msgstr "Confirmación de contraseña" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:69 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:71 msgid "Indent selected task" msgstr "Indentar tarea seleccionada" @@ -3879,12 +3910,13 @@ msgstr "Indentar tarea seleccionada" msgid "Work Report" msgstr "Parte de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:115 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:189 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:135 msgid "Unit Measures" msgstr "Unidades de medida" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:63 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:72 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:39 msgid "Show progress" msgstr "Mostrar progreso" @@ -3893,7 +3925,15 @@ msgstr "Mostrar progreso" msgid "Work" msgstr "Trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:459 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:297 +msgid "" +"Error saving the project\n" +"{0}" +msgstr "" +"Error guardando un proyecto\n" +"{0}" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:358 msgid "" "The task has got progress consolidations. It must delete all consolidations " "to change the resource allocation type " @@ -3901,10 +3941,15 @@ msgstr "" "La tarea tiene consolidaciones de progreso. Debe borrar todas las " "consolidaciones para cambiar el tipo de asignación de recurso " -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:626 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403 +#: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22 +msgid "LibrePlan: Machines" +msgstr "LibrePlan: Máquinas" + +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:630 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:298 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:121 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1335 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1296 msgid "Error" msgstr "Error" @@ -3924,15 +3969,15 @@ msgstr "" msgid "ETC" msgstr "ETC" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:104 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:105 msgid "Log out" msgstr "Salir" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:24 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:25 msgid "Add new configuration unit" msgstr "Añadir nueva unidad de configuración" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:37 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:41 msgid "Main preferences" msgstr "Preferencias principales" @@ -3945,24 +3990,20 @@ msgstr "" "criterionType" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationCommand.java:67 -#: libreplan-webapp/src/main/webapp/planner/order.zul:82 +#: libreplan-webapp/src/main/webapp/planner/order.zul:83 msgid "Progress consolidation" msgstr "Consolidación de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:246 -msgid "Label type saved" -msgstr "Tipo de etiqueta guardado" - -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:419 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:568 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:406 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:556 msgid "missing field name in a description value" msgstr "falta nombre de campo en un valor de descripción" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:46 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:47 msgid "Add new worker assignment" msgstr "Añadir nueva asignación de trabajador" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:441 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:688 msgid "Show all elements" msgstr "Mostrar todos los elementos" @@ -3970,11 +4011,11 @@ msgstr "Mostrar todos los elementos" msgid "It couldn't complete all the reassignations" msgstr "No se han podido completar todas las reasignaciones" -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:77 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:73 msgid "Show dependencies:" msgstr "Mostrar dependencias:" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:66 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:68 msgid "Limited resource" msgstr "Recurso limitante" @@ -3982,6 +4023,10 @@ msgstr "Recurso limitante" msgid "Task Information" msgstr "Información de la tarea" +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:111 +msgid "Apply filter to: " +msgstr "Aplicar filtro a:" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:140 msgid "Hours Group at " msgstr "Grupo de horas en " @@ -3992,8 +4037,8 @@ msgstr "" "Su sesión ha expirado tras un tiempo de inactividad. Por favor, inicie " "sesión de nuevo." -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:166 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:191 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:165 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:190 msgid "SPREAD" msgstr "PROPAGACIÓN" @@ -4005,27 +4050,31 @@ msgstr "un día está vacío" msgid "Budgeted Cost Work Scheduled" msgstr "Coste de trabajo presupuestado planificado" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:57 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703 +msgid "Changes applied" +msgstr "Cambios aplicados" + +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:58 msgid "Name cannot be null or empty" msgstr "El nombre no puede ser nulo o vacío" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:341 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:344 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110 msgid "Progress measurements: " msgstr "Medidas de progreso: " +#: libreplan-webapp/src/main/webapp/common/configuration.zul:43 +msgid "LDAP configuration" +msgstr "Configuración del LDAP" + #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:32 msgid "Queue Element Information" msgstr "Información de elemento de cola" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:136 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:139 msgid "Start Date" msgstr "Fecha de inicio" -#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:31 -msgid "Create Order" -msgstr "Crear proyecto" - #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:22 msgid "Virtual Workers Groups List" msgstr "Lista de grupos de trabajadores virtuales" @@ -4034,13 +4083,13 @@ msgstr "Lista de grupos de trabajadores virtuales" msgid "Cost Variance" msgstr "Desviación en coste" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:470 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:471 msgid "criterion type does not allow resource hierarchy" msgstr "el tipo de criterio no permite jerarquía de recursos" #: libreplan-webapp/src/main/webapp/orders/_edition.zul:150 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:89 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:95 msgid "Total" msgstr "Total" @@ -4053,25 +4102,26 @@ msgstr "Invalidar" msgid "Budget hours" msgstr "Horas del presupuesto" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:165 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:150 msgid "Edit task: {0}" msgstr "Editar tarea: {0}" -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:53 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:52 msgid "Select destination" msgstr "Seleccionar destino" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:269 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:529 +#: libreplan-webapp/src/main/webapp/planner/order.zul:92 +#: libreplan-webapp/src/main/webapp/planner/order.zul:98 +msgid "Check consolidated progresses" +msgstr "Marcar progresos consolidados" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:274 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:530 msgid "must be greater than the previous date." msgstr "debe ser mayor que la fecha anterior" -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:22 -msgid "LibrePlan: Advanced allocation" -msgstr "LibrePlan: Asignación avanzada" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1481 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:583 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1469 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:585 msgid "Show all" msgstr "Mostrar todo" @@ -4080,19 +4130,20 @@ msgid "Estimated hours" msgstr "Horas estimadas" #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:57 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:59 msgid "Default price" msgstr "Precio por defecto" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:116 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:121 msgid "Apply tab changes" msgstr "Aplicar cambios de la pestaña" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:274 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:93 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:171 msgid "passwords don't match" msgstr "las contraseñas no conciden" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:85 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:88 msgid "Day properties" msgstr "Propiedades del día" @@ -4108,7 +4159,7 @@ msgstr "Transferir" msgid "Work Hours Types List" msgstr "Lista de tipos de horas de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:62 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:54 msgid "new milestone" msgstr "nuevo hito" @@ -4116,20 +4167,11 @@ msgstr "nuevo hito" msgid "Value last progress reported" msgstr "Valor último progreso notificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300 msgid "Report Progress" msgstr "Notificar progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:154 -msgid "Unit {0} cannot be removed because it is used in materials" -msgstr "" -"La unidad {0} no se puede borrar porque está siendo usada en materiales" - -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:133 -msgid "Create User" -msgstr "Crear usuario" - -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339 msgid "Schedule from start to deadline" msgstr "Planificar desde el principio a la fecha límite" @@ -4139,33 +4181,45 @@ msgstr "Planificar desde el principio a la fecha límite" msgid "Estimated days" msgstr "Días estimados" -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:65 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:61 msgid "Reference date" msgstr "Fecha de referencia" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:46 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:21 +msgid "LibrePlan: Estimated/Planned Hours Per Task" +msgstr "LibrePlan: Horas por tarea estimadas/planificadas" + +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:48 msgid "Selected node:" msgstr "Nodo seleccionado:" -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21 -msgid "LibrePlan: Task Scheduling Status In Project" -msgstr "LibrePlan: Estado de planificación en proyecto" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:55 +msgid "From chosen date" +msgstr "A partir de la fecha elegida" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:249 -msgid "Create new project from template" -msgstr "Crear nuevo proyecto a partir de plantilla" - -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:74 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:81 msgid "Progress Evolution" msgstr "Evolución del progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:112 +#: libreplan-webapp/src/main/webapp/excetiondays/exceptionDays.zul:22 +msgid "LibrePlan: Exception Days" +msgstr "LibrePlan: Días de excepción" + +#: libreplan-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:23 +msgid "LibrePlan: Work Hours" +msgstr "LibrePlan: Horas de trabajo" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 +msgid "LibrePlan Configuration" +msgstr "LibrePlan: Configuración" + +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:118 msgid "Complete, Partially or Not Scheduled. (Drag and drop to move tasks)" msgstr "" "Completa, parcialmente o no planificada. (Pinche y arrastre para mover " "tareas)" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:88 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91 msgid "Original" msgstr "Original" @@ -4186,21 +4240,21 @@ msgstr "No indentable" msgid "Resource allocation type" msgstr "Tipo de asignación de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:491 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:70 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:493 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:71 msgid "List of materials for all categories (select one to filter)" msgstr "" "Lista de materiales para todas las categorías (seleccione una para filtrar)" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:99 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:103 msgid "User disabled" msgstr "Usuario deshabilitado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:733 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:788 msgid "In the available periods {0} only {1} hours are available." msgstr "En los períodos disponibles {0} solo {1} horas están disponibles." -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:100 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:118 msgid "Association with profiles" msgstr "Asociación con perfiles" @@ -4213,20 +4267,28 @@ msgstr "Tarea {0} : Código duplicado en BD" msgid "Message - {0}" msgstr "Mensaje - {0}" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:121 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:21 +msgid "LibrePlan: Settings" +msgstr "LibrePlan: Preferencias" + +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:124 msgid "worker's surname not specified" msgstr "apellidos del trabajador no especificados" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:211 -msgid "Error on removing workReportType: " -msgstr "Error al borrar tipo de parte de trabajo: " - #: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:41 #: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:48 msgid "Save changes" msgstr "Guardar cambios" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:669 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:77 +msgid "Application settings" +msgstr "Preferencias de la aplicación" + +#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:47 +msgid "Average of estimated hours" +msgstr "Media de horas estimadas" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:682 msgid "" "You can not remove the task \"{0}\" because of this or any of its children " "are already in use in some work reports" @@ -4234,60 +4296,64 @@ msgstr "" "No puede borrar la tarea \"{0}\" porque alguno de sus hijos ya se está " "usando en algún parte de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:192 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:203 msgid "Total dedication" msgstr "Dedicación total" -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:45 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:44 msgid "Select source" msgstr "Seleccionar origen" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:825 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:828 msgid "Worker deleted" msgstr "Trabajador borrado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:735 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:733 msgid "Select entity, please" msgstr "Seleccionar entidad, por favor" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:293 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:291 msgid "Stretch date must not be greater than the task's end date: " msgstr "" "La fecha de un tramo no debe ser mayor que la fecha de fin de la tarea: " +#: libreplan-webapp/src/main/webapp/users/profiles.zul:23 +msgid "LibrePlan: Profiles" +msgstr "LibrePlan: Perfiles" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:38 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44 msgid "Subcontratation date" msgstr "Fecha de subcontratación" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:212 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:207 msgid "Number of digits:" msgstr "Número de dígitos:" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:93 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:182 +#: 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/java/org/libreplan/web/labels/LabelTypeCRUDController.java:233 -msgid "Edit Label Type" -msgstr "Editar tipo de etiqueta" +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:54 +msgid "Current password" +msgstr "Contraseña actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:911 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1197 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:349 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1181 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:276 msgid "Please, select an item" msgstr "Por favor, seleccione un elemento" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:180 -msgid "Work report type saved" -msgstr "Tipo de partes de trabajo guardado" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1122 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1096 msgid "Cannot be higher than finish hour" msgstr "No puede ser mayor que la fecha de fin" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:225 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:223 msgid "Prefix" msgstr "Prefijo" @@ -4300,44 +4366,48 @@ msgstr "Código subcontratado" msgid "New Template element" msgstr "Nuevo elemento de plantilla" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:21 -msgid "LibrePlan: Hours Worked Per Worker In A Month" -msgstr "LibrePlan: Horas trabajadas por trabajador en un mes" - #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:251 #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:325 msgid "The base calendar parent not found" msgstr "Calendario base padre no encontrado" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:94 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:97 msgid "Non Consolidated" msgstr "No consolidado" +#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:43 +msgid "From date" +msgstr "A partir de la fecha" + #: libreplan-webapp/src/main/webapp/planner/reassign.zul:34 msgid "Reassigning type" msgstr "Tipo de reasignación" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:295 -msgid "Edit Virtual Workers Group" -msgstr "Editar grupo de trabajadores virtuales" +#: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:22 +msgid "LibrePlan: Virtual Workers Groups" +msgstr "LibrePlan: Grupos de trabajadores virtuales" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:441 +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:190 +msgid "{0} \"{1}\" can not be deleted because of it is being used" +msgstr "{0} \"{1}\" no se puede borrar porque está siendo usado" + +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:445 msgid "Edit limiting resource element" msgstr "Editar elemento de recurso limitante" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:862 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:770 msgid "The field name must be unique, not null and not empty" msgstr "El nombre del campo debe ser único, no nulo y no vacío" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:381 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:382 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:136 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:157 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85 msgid "Position" msgstr "Posición" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:104 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:108 msgid "Incorrect authentication" msgstr "Identificación incorrecta" @@ -4351,15 +4421,15 @@ msgstr "Editar tarea" msgid "Edit work report" msgstr "Editar parte de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:45 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:44 msgid "Limiting resources (project)" msgstr "Recursos limitantes (proyecto)" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:764 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:672 msgid "A description field of the same name already exists." msgstr "Ya existe un campo de descripción con el mismo nombre." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1174 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1177 msgid "" "Progress measurements that are reported by quality forms can not be removed" msgstr "" @@ -4370,26 +4440,21 @@ msgstr "" msgid "Current value" msgstr "Valor actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:165 -msgid "Edit Quality Form" -msgstr "Editar formulario de calidad" - #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:823 msgid "Duplicate progress assignment for task " msgstr "Asignación de progreso duplicada para la tarea " -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:48 -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:54 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:84 +#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:46 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:94 msgid "Save and Continue" msgstr "Guardar y continuar" -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:46 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:50 msgid "Zoom level" msgstr "Nivel de zoom" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:28 -#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:166 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:29 +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:168 msgid "Quality form" msgstr "Formulario de calidad" @@ -4397,16 +4462,21 @@ msgstr "Formulario de calidad" msgid "Go!" msgstr "Ir!" -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:271 +#: libreplan-webapp/src/main/webapp/calendars/_list.zul:30 +msgid "Inherits up to date" +msgstr "Hereda hasta la fecha" + +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:280 msgid "The name of the label is empty." msgstr "El nombre de la etiqueta está vacío." -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:26 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:27 msgid "Profile data" msgstr "Datos del perfil" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:31 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:35 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:248 msgid "Configuration" msgstr "Configuración" @@ -4414,30 +4484,43 @@ msgstr "Configuración" msgid "It was not possible load entity. Not found. Id: " msgstr "No ha sido posible cargar la entidad. No encontrada. Id: " -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:569 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:496 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:528 +msgid "This date can not be empty" +msgstr "La fecha no puede ser vacía" + +#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:22 +msgid "LibrePlan: Workers" +msgstr "LibrePlan: Trabajadores" + +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:572 msgid "Create Virtual Workers Group" msgstr "Crear grupo de trabajadores virtuales" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:933 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:861 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:678 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:911 msgid "Hours invested" msgstr "Horas invertidas" -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:160 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:324 +msgid "Authorization" +msgstr "Autorización" + +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:119 msgid "" "The name is not valid, there is another progress type with the same name. " msgstr "" "El nombre no es válido, ya hay otro tipo de progreso con el mismo nombre. " -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:740 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318 msgid "Project saved" msgstr "Proyecto guardado" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:45 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:44 msgid "task :" msgstr "tarea :" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:712 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:715 msgid "ALL" msgstr "TODOS" @@ -4445,11 +4528,11 @@ msgstr "TODOS" msgid "criterion satisfaction's resource not specified" msgstr "recurso del criterio satisfecho no especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:596 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:68 msgid "Derived exception" msgstr "Excepción derivada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:291 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:292 msgid "Machines" msgstr "Máquinas" @@ -4457,10 +4540,6 @@ msgstr "Máquinas" msgid "Unit Measures List" msgstr "Lista de unidades de medida" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:222 -msgid "Confirm deleting this profile. Are you sure?" -msgstr "Confirmar el borrado de este perfil. ¿Está seguro?" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:153 msgid "Couldn't find element: {0}" msgstr "No se pudo encontrar el elemento: {0}" @@ -4474,27 +4553,27 @@ msgstr "Debe seleccionar un escenario de destino" msgid "unit type code not found" msgstr "código de tipo de unidad no encontrado" -#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:180 -msgid "Calendar Exception Type saved" -msgstr "Tipo de excepción de calendario guardado" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342 +msgid "My account" +msgstr "Mi cuenta" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:42 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:41 msgid "Resource :" msgstr "Recurso :" -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:40 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:39 msgid "Destination scenario" msgstr "Escenario de destino" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:153 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:105 msgid "Company view" msgstr "Vista de la compañía" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:18 -msgid "LibrePlan: Configuration" -msgstr "LibrePlan: Configuración" +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:114 +msgid "Both" +msgstr "Ambos" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:751 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:758 msgid "Not editable for containing more that an hours group." msgstr "No editable por contener más de un grupo de horas." @@ -4502,43 +4581,43 @@ msgstr "No editable por contener más de un grupo de horas." msgid "Filter by" msgstr "Filtrar por" -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:45 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:76 +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:46 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:80 msgid "Limiting resource" msgstr "Recurso limitante" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/calendar/CalendarAllocationCommand.java:58 -#: libreplan-webapp/src/main/webapp/planner/order.zul:147 +#: libreplan-webapp/src/main/webapp/planner/order.zul:146 msgid "Calendar allocation" msgstr "Asignación de calendario" +#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:48 +msgid "Up to date" +msgstr "Actualizado" + #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:819 msgid "Duplicate value true report global progress for task" msgstr "" "Valor verdadero duplicado para la propiedad 'notificar progreso global' en " "la tarea" -#: libreplan-webapp/src/main/webapp/materials/materials.zul:85 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:84 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:32 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:120 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33 msgid "Category" msgstr "Categoría" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:154 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:156 msgid "must be greater than finish date" msgstr "debe ser mayor que la fecha de fin" -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 -msgid "LibrePlan: Materials Needs At Date" -msgstr "LibrePlan: Necesidad de materiales en fecha" - #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:79 -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:202 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:203 msgid "[generic all workers]" msgstr "[genérico todos los trabajadores]" -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:26 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:27 msgid "Category data" msgstr "Datos de categoría" @@ -4546,18 +4625,30 @@ msgstr "Datos de categoría" msgid "Search" msgstr "Buscar" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:126 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:242 +msgid "Valid until" +msgstr "Válido hasta" + +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:128 msgid "Add New Complementary Field" msgstr "Añadir nuevo campo complementario" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:229 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:232 msgid "Work weeks list" msgstr "Lista de las semanas de trabajo" -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:39 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:38 msgid "Source scenario" msgstr "Escenario de origen" +#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:24 +msgid "LibrePlan: Criteria" +msgstr "LibrePlan: Criterios" + +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:23 +msgid "LibrePlan: Transfer Projects Between Scenarios" +msgstr "LibrePlan: transferir proyectos entre escenarios" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:118 msgid "%" msgstr "%" @@ -4567,25 +4658,27 @@ msgstr "%" msgid "Remove calendar" msgstr "Borrar calendario" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1548 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1712 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:512 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:648 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1346 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:656 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:228 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:312 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:256 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:139 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1536 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1700 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:425 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:651 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1323 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:669 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:254 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:337 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:259 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:141 msgid "must be lower than finish date" msgstr "debe ser menor que la fecha de fin" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:757 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:29 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:161 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:766 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:158 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:70 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:135 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:79 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:81 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33 msgid "Resource" msgstr "Recurso" @@ -4598,16 +4691,16 @@ msgstr "Total de horas de tarea" msgid "Date last progress reported" msgstr "Fecha último progreso notificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/RedirectorSynthetiser.java:123 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/RedirectorSynthetiser.java:125 msgid "Could not load any resource" msgstr "No se pudo cargar un recurso" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:334 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:335 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:37 msgid "Work And Progress Per Project" msgstr "Trabajo y progreso por proyecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:383 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:386 msgid "" "You must allow multiple active criteria for this type to use this assignment " "strategy" @@ -4623,26 +4716,26 @@ msgstr "sub elementos" msgid "Default Label" msgstr "Etiqueta por defecto" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:188 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:187 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:85 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:108 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:113 msgid "Close" msgstr "Cerrar" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:471 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:945 msgid "Specific Allocations" msgstr "Asignaciones específicas" -#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:271 +#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:225 #: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java:119 msgid "error doing reassignation: {0}" msgstr "Error realizando la reasignación: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:349 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:423 msgid "Time filter" msgstr "Filtro de tiempo" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:61 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:63 msgid "Move selected task up" msgstr "Mover tarea seleccionada hacia arriba" @@ -4651,44 +4744,32 @@ msgid "Select criteria set or specific resources for allocation" msgstr "" "Seleccione conjunto de criterios o recursos específicos para la asignación" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:316 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:348 msgid "Create copy" msgstr "Crear copia" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:34 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:33 msgid "Work Report Lines List" msgstr "Lista de líneas de parte de trabajo" -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:27 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:28 msgid "Company data" msgstr "Datos de la empresa" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:215 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:151 msgid "Unit type code cannot be empty" msgstr "El código del tipo de unidad no puede ser vacío" -#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:47 -msgid "Average of the estimated hours" -msgstr "Media de horas estimadas" - -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:178 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:240 -msgid "Quality form saved" -msgstr "Formulario de calidad guardado" - -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:167 -msgid "Create Unit Type" -msgstr "Crear tipo de unidad" - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:184 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312 msgid "Users" msgstr "Usuarios" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:143 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:145 msgid "Label Type fields" msgstr "Campos de tipo de etiqueta" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:103 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:105 msgid "Hours Management" msgstr "Administración de horas" @@ -4696,7 +4777,7 @@ msgstr "Administración de horas" msgid "New task:" msgstr "Nueva tarea :" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:140 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:144 msgid "" "Please use some of the compatible browsers: Chrome, Firefox, Safari or " "Epiphany." @@ -4708,7 +4789,7 @@ msgstr "" msgid "specific allocation" msgstr "asignación específica" -#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:147 +#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:148 msgid "company name has to be unique. It is already used" msgstr "el nombre de la empresa debe ser único. Ya está siendo usado" @@ -4725,28 +4806,24 @@ msgstr "" msgid "Template saved" msgstr "Plantilla guardada" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:305 -msgid "Confirm deleting this User. Are you sure?" -msgstr "Confirmar el borrado de este usuario. ¿Está seguro?" - -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:577 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:565 msgid "work report have not any description value with this field name" msgstr "" "El parte de trabajo no tiene ningún valor de descripción con ese nombre de " "campo" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:179 -msgid "User saved" -msgstr "Usuario guardado" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:23 +msgid "LibrePlan: Configuration" +msgstr "LibrePlan: Configuración" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47 msgid "Task quality form name" msgstr "Nombre del formulario de calidad de tarea" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1097 -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:156 -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:161 -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:181 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1093 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:158 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:163 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:183 msgid "Some cost category assignments overlap in time" msgstr "Algunas asignaciones a categorías de coste se solapan en el tiempo" @@ -4774,45 +4851,41 @@ msgstr "Grupo" msgid "Statistics list " msgstr "Lista de estadísticas " +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1116 +msgid "Please, enter a valid effort" +msgstr "Por favor, introduzca un esfuerzo válido" + #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:28 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:59 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:61 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:62 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:56 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:65 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:58 msgid "Enabled" msgstr "Activado" -#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:143 -msgid "Edit Exception Day Type" -msgstr "Editar tipo de día de excepción" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:222 msgid "All resources must be limiting. " msgstr "Todos los recursos deben ser limitantes. " -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:327 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:525 msgid "Filter by worker" msgstr "Filtrar por trabajadores" -#: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22 -msgid "LibrePlan: Machines" -msgstr "LibrePlan: Máquinas" - #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:47 msgid "Load due to current project" msgstr "Carga debido al proyecto actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1344 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305 msgid "You are going to change the assignment function. Are you sure?" msgstr "Va a cambiar la función de asignación. ¿Está seguro?" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 msgid "Exception Days" msgstr "Días de excepción" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:200 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:183 msgid "There must be at least 2 stretches for doing interpolation" msgstr "Debe haber al menos dos tramos para hacer interpolación" @@ -4820,59 +4893,58 @@ msgstr "Debe haber al menos dos tramos para hacer interpolación" msgid "Incompatible update: stored resource is not of type: {0}" msgstr "Actualización incompatible: el recurso almacenado no es de tipo: {0}" -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:38 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:42 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:213 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:207 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:187 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:98 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:90 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:114 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:109 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:100 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:92 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:118 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:114 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:40 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:133 -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:39 -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:42 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:75 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:82 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:137 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:132 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:135 +#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:67 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:78 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:83 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:137 msgid "Save & Continue" msgstr "Guardar y continuar" +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21 +msgid "LibrePlan: Work And Progress Per Project" +msgstr "LibrePlan: Trabajo y Progreso por Proyecto" + #: libreplan-webapp/src/main/webapp/orders/_edition.zul:90 msgid "Scheduling mode" msgstr "Modo de planificación" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:53 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:55 -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:50 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:54 +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29 -#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:34 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:23 msgid "Filter" msgstr "Filtrar" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:943 +msgid "Work Report Type" +msgstr "Tipo de parte de trabajo" + #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:26 msgid "Assigned locations" msgstr "Ubicaciones asignadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:247 -msgid "Unit type saved" -msgstr "Tipo de unidad guardado" - -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:267 -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:129 -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:138 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:270 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:131 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:140 msgid "Two hour costs with the same type overlap in time" msgstr "Dos costes por hora con el mismo tipo se solapan en el tiempo" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:201 -msgid "Create Machine" -msgstr "Crear máquina" - -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:64 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:66 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49 msgid "Report progress" msgstr "Notificar progreso" @@ -4881,7 +4953,7 @@ msgstr "Notificar progreso" msgid "ACWP" msgstr "ACWP" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:736 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:791 msgid "The periods available depend on the resource's calendar." msgstr "Los períodos de disponibilidad dependen del calendario del recurso." @@ -4889,7 +4961,7 @@ msgstr "Los períodos de disponibilidad dependen del calendario del recurso." msgid "START" msgstr "INICIO" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:313 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:342 msgid "Schedule from the deadline to start" msgstr "Planificar desde la fecha límite al principio" @@ -4897,18 +4969,18 @@ msgstr "Planificar desde la fecha límite al principio" msgid "generic machines allocation" msgstr "asignación genérica de máquinas" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:372 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:375 msgid "Non limiting resource assignation" msgstr "Asignación de recursos no limitantes" #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:87 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75 -#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:82 +#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68 msgid "Back" msgstr "Atrás" #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:56 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:58 msgid "Subcontractor" msgstr "Subcontratista" @@ -4917,22 +4989,18 @@ msgstr "Subcontratista" msgid "Administration" msgstr "Administración" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1531 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1694 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:495 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:631 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1329 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:638 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:211 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:293 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:239 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1519 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1682 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:634 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1306 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:651 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:237 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:242 msgid "must be greater than start date" msgstr "debe ser mayor que la fecha de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:93 -msgid "Create Company" -msgstr "Crear empresa" - #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:47 msgid "Cancel and return" msgstr "Cancelar y volver" @@ -4942,25 +5010,28 @@ msgstr "Cancelar y volver" msgid "Assign quality form" msgstr "Asignar formulario de calidad" -#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:222 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:387 msgid "Delete item {0}. Are you sure?" msgstr "Borrar elemento {0}. ¿Está seguro?" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:215 +msgid "Error setting up creationg form for Criterion Type with id}" +msgstr "" +"Error preparando el formulario de edición para el tipo de criterio con id}" + #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:39 msgid "worked hours" msgstr "horas trabajadas" -#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:50 +#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:51 msgid "Unit measure name" msgstr "Nombre de la unidad de medida" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:772 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:144 msgid "cannot include a progress of the same progress type twice" msgstr "no se puede asignar un progreso del mismo tipo dos veces" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:489 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:476 msgid "a work report line has not this label type assigned" msgstr "una línea de parte de trabajo no tiene este tipo de etiqueta asignada" @@ -4969,35 +5040,34 @@ msgstr "una línea de parte de trabajo no tiene este tipo de etiqueta asignada" msgid "Allocations" msgstr "Asignaciones" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32 -#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:32 -msgid "Choosing Template" -msgstr "Selección de plantilla" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52 msgid "Task code" msgstr "Código de la tarea" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:133 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:50 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:135 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:49 msgid "Length" msgstr "Longitud" #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:85 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:89 msgid "Capacity" msgstr "Capacidad" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:299 -#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:178 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:331 +#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:133 msgid "Create derived" msgstr "Crear derivado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:627 +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:302 +msgid "Label Types" +msgstr "Tipos de etiqueta" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:638 msgid "it must be greater than zero" msgstr "debe ser mayor que cero" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:130 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:131 msgid "must be a real positive number" msgstr "debe ser un número real positivo" @@ -5010,36 +5080,35 @@ msgstr "No se han hecho asignaciones" msgid "Total hours task" msgstr "Total de horas de tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:409 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:441 msgid "Removed calendar \"{0}\"" msgstr "Borrado calendario \"{0}\"" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1083 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:23 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1063 msgid "Create project" msgstr "Crear proyecto" -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:49 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:542 +msgid "This date can not include the whole next work week" +msgstr "Esta fecha no puede incluir a la próxima semana de trabajo completa" + +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:51 msgid "" "Allow multiple values of this type of criterion in the same period of time" msgstr "" "Permitir valores múltiples para este tipo de criterio en el mismo período de " "tiempo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1300 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1294 msgid "" "The date is not valid, the date must be unique for this progress assignment" msgstr "La fecha no es válida, debe ser única para esta asignación de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:113 -msgid "Edit Criterion Type" -msgstr "Editar tipo de criterio" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:445 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:453 msgid "The code cannot be empty." msgstr "El código no puede estar vacío" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36 msgid "Human hours per machine working hour within configuration unit" msgstr "" "Horas humanas por hora de trabajo de máquina dentro de unidad de " @@ -5058,12 +5127,16 @@ msgstr "" msgid "New work report" msgstr "Nuevo parte de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:668 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:862 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:865 msgid "yes" msgstr "sí" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:886 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:304 +msgid "Root calendar" +msgstr "Calendario raíz" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:862 msgid "" "Deleting this subcontracted project, you are going to lose the relation to " "report progress. Are you sure?" @@ -5084,17 +5157,17 @@ msgstr "Fecha de fin" msgid "Validate" msgstr "Validar" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:143 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:175 msgid "This resource has already been added." msgstr "Este recurso ya ha sido añadido." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:129 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:149 msgid "Calendar exception types" msgstr "Tipos de excepciones de calendario" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33 -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:24 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:34 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:25 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:36 msgid "Cost category assignment" msgstr "Asignación de categoría de coste" @@ -5102,14 +5175,10 @@ msgstr "Asignación de categoría de coste" msgid "missing code in a hour cost" msgstr "falta código en un coste por hora" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:822 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:870 msgid "All workers" msgstr "Todos los trabajadores" -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:304 -msgid "Label saved" -msgstr "Etiqueta guardada" - #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector_combo.zul:25 msgid "Select criteria or resources" msgstr "Seleccione criterios o recursos" @@ -5121,58 +5190,57 @@ msgid "Select required criteria set and press filter button" msgstr "" "Seleccione conjunto de criterios requeridos y pulse el botón de filtrar" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1018 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1279 +#: libreplan-webapp/src/main/java/org/libreplan/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/calendars/BaseCalendarEditionController.java:990 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1181 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1438 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:135 -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:229 -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:231 -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:233 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:311 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:280 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:380 +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:121 +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:123 +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:207 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:307 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:115 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:147 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:740 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:135 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:168 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:738 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:134 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:63 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:128 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:47 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:44 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:72 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:49 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:42 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:48 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:44 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:50 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:84 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:88 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:93 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:33 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:42 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:53 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:43 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:54 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:43 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:53 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:42 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:44 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:58 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:129 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:48 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:46 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:74 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:50 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:43 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:50 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:45 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:53 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:89 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:94 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:92 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:94 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:34 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:54 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:44 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:55 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:61 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:54 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:43 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:46 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:37 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:44 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:45 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:39 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96 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/webapp/reports/schedulingProgressPerOrderReport.zul:21 -msgid "LibrePlan: Work And Progress Per Project" -msgstr "LibrePlan: Trabajo y Progreso por Proyecto" - #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:43 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:52 msgid "New code" @@ -5182,25 +5250,21 @@ msgstr "Código nuevo" msgid "The progress type cannot be modified" msgstr "El tipo de progreso no puede ser modificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:412 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:392 msgid "Calculate Resources per Day" msgstr "Calcular recursos por día" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:996 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:904 msgid "The index fields and labels must be uniques and consecutives" msgstr "Los campos de índice y las etiquetas deben ser únicas y consecutivas" -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:21 -msgid "LibrePlan: Estimated/Planned Hours Per Task" -msgstr "LibrePlan: Horas por tarea estimadas/planificadas" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:130 msgid "Estimate To Complete" msgstr "Estimación del coste pendiente" -#: libreplan-webapp/src/main/webapp/materials/materials.zul:84 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:83 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:29 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 msgid "Unit type" msgstr "Tipo de unidad" @@ -5213,21 +5277,21 @@ msgstr "Carga debido a otras asignaciones" msgid "Sum of all task leafs imputed hours" msgstr "Suma de horas imputadas por todas las tareas hoja" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:644 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:554 msgid "This machine was already removed by other user" msgstr "Esta máquina ya ha sido borrada por otro usuario" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:293 -msgid "Work Reports" -msgstr "Partes de trabajo" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:256 +msgid "Host:" +msgstr "Host:" #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:26 msgid "Calendar data" msgstr "Datos del calendario" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:173 -msgid "login name is already being used by another user" -msgstr "el nombre de usuario ya está siendo usado" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:294 +msgid "Work Reports" +msgstr "Partes de trabajo" #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:22 msgid "Cost Categories List" @@ -5237,31 +5301,37 @@ msgstr "Lista de Categorías de Coste" msgid "code is already used" msgstr "el código ya está siendo usado" +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:67 +msgid "Labels list" +msgstr "Lista de etiquetas" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:284 +msgid "Password:" +msgstr "Contraseña:" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:152 msgid "Criterion Requirements" msgstr "Criterios requeridos" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:148 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:185 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:212 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:66 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:188 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:215 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:76 msgid "Extra Effort" msgstr "Esfuerzo extra" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:57 -msgid "Move selected task down" -msgstr "Mover tarea seleccoinada hacia abajo" - -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:260 +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:269 msgid "Already exists other label with the same name" msgstr "Ya existe otra etiqueta con el mismo nombre" +#: libreplan-webapp/src/main/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/OrderFilterEnum.java:32 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32 msgid "Customer Reference" msgstr "Referencia de cliente" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:777 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:134 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:147 msgid "spread values are not valid, at least one value should be true" @@ -5280,15 +5350,15 @@ msgstr "Optimista" msgid "SV" msgstr "SV" -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:83 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:85 msgid "Our company login" msgstr "Nombre de usuario de nuestra empresa" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1483 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1471 msgid "Filter work reports" msgstr "Filtrar partes de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:395 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:427 msgid "" "Default calendar cannot be removed. Please, change the default calendar in " "the Configuration window before." @@ -5296,10 +5366,10 @@ msgstr "" "El calendario por defecto no se puede. Por favor, cambie antes el calendario " "por defecto en la ventana de configuración." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:587 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:932 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:858 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:600 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:677 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:908 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:46 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:49 #: libreplan-webapp/src/main/webapp/templates/templates.zul:63 @@ -5307,7 +5377,7 @@ msgstr "" msgid "Progress" msgstr "Progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:128 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:259 msgid "" "This criterion type cannot be deleted because it has assignments to projects " "or resources" @@ -5315,31 +5385,27 @@ msgstr "" "Este tipo de criterio no se puede borrar porque tiene asignaciones a " "proyectos o recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1221 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1224 msgid "All progress types have already been assigned." msgstr "Todos los tipos de progreso ya han sido asignados." -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80 msgid "Price per hour" msgstr "Precio por hora" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:209 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:211 msgid "Project: {0} " msgstr "Proyecto: {0} " -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:314 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:315 msgid "Calendars" msgstr "Calendarios" -#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:21 -msgid "LibrePlan: Page not found" -msgstr "LibrePlan: Página no encontrada" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:355 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:360 msgid "The date cannot be null" msgstr "La fecha no puede ser nula" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:316 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:317 msgid "" "Another task in the same branch is already reporting progress for this " "quality form" @@ -5347,6 +5413,10 @@ msgstr "" "Otra tarea en la misma rama ya está informando de un progreso para este " "formulario de calidad" +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:30 +msgid "options" +msgstr "opciones" + #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92 msgid "Latest date" msgstr "Fecha más tardía" @@ -5355,13 +5425,18 @@ msgstr "Fecha más tardía" msgid "Show only current satisfied criteria" msgstr "Mostrar solo los criterios satisfechos actualmente" -#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:231 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:23 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:23 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:23 +msgid "LibrePlan: Work Reports" +msgstr "LibrePlan: Partes de trabajo" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:393 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:373 msgid "Error on showing delete confirm" msgstr "Error al mostrar la confirmación de borrado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:671 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:623 msgid "Sum of all rows" msgstr "Suma de todas las filas" @@ -5377,15 +5452,7 @@ msgstr "Hora de fin" msgid "Done {0} of {1}" msgstr "Hecho {0} de {1}" -#: libreplan-webapp/src/main/webapp/users/users.zul:23 -msgid "LibrePlan: Accounts" -msgstr "LibrePlan: Cuentas" - -#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:23 -msgid "LibrePlan: Scenarios Management" -msgstr "LibrePlan: Gestión de Escenarios" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:194 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:177 msgid "" "Last stretch should have one hundred percent for length and amount of work " "percentage" @@ -5393,12 +5460,12 @@ msgstr "" "El último tramo debe tener 100% de porcentajes de longitud y cantidad de " "trabajo" -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:79 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:100 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:71 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:60 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:75 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:60 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:96 msgid "Filter by projects" msgstr "Filtrar por proyectos" @@ -5406,17 +5473,17 @@ msgstr "Filtrar por proyectos" msgid "Criteria of selected type " msgstr "Criterios del tipo seleccionado " -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:33 msgid "Each worker configuration unit name" msgstr "Nombre de la unidad de configuración de cada trabajador" #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43 -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:42 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:224 +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:44 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:221 msgid "Active" msgstr "Activo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1258 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1261 msgid "This progress measurement can not be in " msgstr "Esta medida de progreso no puede estar en " @@ -5424,7 +5491,7 @@ msgstr "Esta medida de progreso no puede estar en " msgid "Inherited labels" msgstr "Etiquetas heredadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1243 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1246 msgid "" "This progress can not be changed or removed, because it has got consolidated " "progress. It is needed to remove the consolidation on all its progress." @@ -5434,12 +5501,12 @@ msgstr "" "progreso." #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:910 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:917 msgid "Unindent" msgstr "Desindentar" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:932 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1390 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:935 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1384 msgid "Value is not valid, the current value must be not empty" msgstr "El valor no es válido, el valor actual no debe ser vacío" @@ -5447,7 +5514,11 @@ msgstr "El valor no es válido, el valor actual no debe ser vacío" msgid "Direct labels" msgstr "Etiquetas directas" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:92 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:43 +msgid "From today" +msgstr "A partir de hoy" + +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:96 msgid "Log in" msgstr "Entrar" @@ -5455,15 +5526,15 @@ msgstr "Entrar" msgid "Project name" msgstr "Nombre del proyecto" -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:53 +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:55 msgid "Precision" msgstr "Precisión" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:372 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:359 msgid "missing code in a work report line" msgstr "falta código en una línea de parte de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:985 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:928 msgid "Efforts" msgstr "Esfuerzos" @@ -5471,32 +5542,30 @@ msgstr "Esfuerzos" msgid "Show all reported hours" msgstr "Mostrar todas las horas notificadas" -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:22 -msgid "LibrePlan: Subcontracted Tasks" -msgstr "LibrePlan: Tareas subcontratadas" - +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:102 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:113 msgid "Projects List" msgstr "Lista de proyectos" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:137 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:58 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:65 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:49 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:74 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:51 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:52 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:136 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:60 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:50 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:76 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:52 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:56 #: libreplan-webapp/src/main/webapp/materials/materials.zul:60 -#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:44 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:45 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:45 +#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:45 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:44 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:46 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:46 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:80 msgid "Generate code" msgstr "Generar código" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:110 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:116 msgid "Scheduling state" msgstr "Estado de planificación" @@ -5508,19 +5577,27 @@ msgstr "Esta plantilla no se puede borrar porque tiene aplicaciones." msgid "The code sequence is already in use and it can not be updated." msgstr "El código de secuencia ya está en uso y no se puede actualizar." -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21 -msgid "LibrePlan: Project Costs Per Resource" -msgstr "LibrePlan: costes de proyecto por recurso" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:332 +msgid "Import LDAP roles" +msgstr "Importar roles del LDAP" + +#: libreplan-webapp/src/main/webapp/settings/settings.zul:43 +msgid "Personal Data" +msgstr "Datos personales" #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java:206 msgid "criterion satisfaction's criterion not specified" msgstr "criterio del criterio satisfecho no especificado" +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:21 +msgid "LibrePlan: Hours Worked Per Resource" +msgstr "LibrePlan: Horas Trabajadas Por Recurso" + #: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:163 msgid "Number of iterations should be between 1 and " msgstr "El número de iteraciones debería estar entre 1 y " -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:126 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:142 msgid "Scenarios must be enabled as more elements than master exist" msgstr "" "Los escenarios deben estar habilitados ya que existen más elementos que " @@ -5540,11 +5617,11 @@ msgstr "Tarea {0} : El grupo de tareas tiene un tipo incompatible con {1}" msgid "Profiles authorization" msgstr "Autorización de perfiles" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:292 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:293 msgid "Virtual Workers Groups" msgstr "Grupos de trabajadores virtuales" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:144 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:95 msgid "Planning charts expanded" msgstr "Gráficos de planificación expandidos" @@ -5552,7 +5629,11 @@ msgstr "Gráficos de planificación expandidos" msgid "Assignation" msgstr "Asignación" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:431 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:694 +msgid "Inh" +msgstr "Her" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:339 msgid "Not deletable" msgstr "Imborrable" @@ -5568,7 +5649,7 @@ msgstr "código no especificado" msgid "Projects list" msgstr "Lista de proyectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:190 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:973 msgid "" "Cannot delete work report type. There are some work reports bound to it." msgstr "" @@ -5579,41 +5660,40 @@ msgstr "" msgid "Criterion Type List" msgstr "Lista de tipos de criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:732 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:702 msgid "Overall progress" msgstr "Progreso global" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:52 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:54 msgid "Create template from selected task" msgstr "Crear plantilla a partir de tarea seleccionada" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:119 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:129 msgid "All projects" msgstr "Todos los proyectos" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:47 -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:79 +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:41 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:60 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:83 msgid "Password" msgstr "Contraseña" #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:36 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:89 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:93 msgid "Observations" msgstr "Observaciones" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:962 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:942 msgid "Edit project" msgstr "Editar proyecto" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:24 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:25 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:27 msgid "Progress assignments" msgstr "Asignaciones de progreso" -#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:27 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:244 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:263 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:285 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:240 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:262 msgid "Valid from" msgstr "Válido desde" @@ -5625,24 +5705,24 @@ msgstr "la fecha de excepción ya existe" msgid "There exists other template with the same name." msgstr "Ya existe otra plantilla con el mismo nombre." -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:59 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:53 msgid "Month" msgstr "Mes" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:900 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:911 msgid "{0} could not be allocated. Cannot allocate more than one resource" msgstr "No se pudo asignar {0}. No se puede asignar más que un recurso" -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:56 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:58 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32 msgid "Color" msgstr "Color" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:759 -msgid "Advanced assignment saved" -msgstr "Asignación avanzada guardada" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:105 +msgid "Current password is incorrect" +msgstr "La contraseña actual es incorrecta" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:366 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:367 msgid "Cannot insert material in general view. Please, select a category" msgstr "" "No se puede insertar material en la vista general. Por favor, seleccione una " @@ -5652,36 +5732,44 @@ msgstr "" msgid "criterion satisfaction's start date not specified" msgstr "fecha de inicio del criterio satisfecho no especificada" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:371 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:405 msgid "Only {0} resources per day were achieved for current allocation" msgstr "Sólo se han logrado {0} recursos por día para la asignación actual" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:311 +msgid "Delete {0} \"{1}\". Are you sure?" +msgstr "Borrar {0} \"{1}\". ¿Está seguro?" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:270 +msgid "Base:" +msgstr "Base:" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:51 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:133 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:79 -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:97 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:86 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:98 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:48 -#: libreplan-webapp/src/main/webapp/planner/order.zul:69 -#: libreplan-webapp/src/main/webapp/planner/order.zul:132 -#: libreplan-webapp/src/main/webapp/planner/order.zul:167 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:83 -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:39 -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:43 +#: libreplan-webapp/src/main/webapp/planner/order.zul:70 +#: libreplan-webapp/src/main/webapp/planner/order.zul:131 +#: libreplan-webapp/src/main/webapp/planner/order.zul:166 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:89 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:79 #: libreplan-webapp/src/main/webapp/planner/main.zul:66 msgid "Accept" msgstr "Aceptar" -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:79 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:81 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:259 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:266 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:273 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:280 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:308 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:339 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:346 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:353 msgid "Example: {0}" msgstr "Ejemplo: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:283 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:303 -#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:40 -msgid "Edit Worker" -msgstr "Editar trabajador" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:458 msgid "" "Create new material assignment out of material assignment {0}. Are you sure?" @@ -5689,7 +5777,7 @@ msgstr "" "Crear nueva asignación de material fuera de la asignación de material {0}. " "¿Está seguro?" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:193 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:190 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:167 msgid "Work report lines" msgstr "Líneas del parte de trabajo" @@ -5698,17 +5786,17 @@ msgstr "Líneas del parte de trabajo" msgid "Calculated" msgstr "Calculado" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:211 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:213 msgid "Completed: {0}% " msgstr "Completado: {0}% " -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:118 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:229 msgid "Error setting up edition form for Criterion Type with id: {0}" msgstr "" "Error preparando el formulario de edición para el tipo de criterio con id: " "{0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1178 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1181 msgid "Calculated progress measurement can not be removed" msgstr "Las medidas de progreso calculadas no se pueden borrar" @@ -5717,22 +5805,22 @@ msgstr "Las medidas de progreso calculadas no se pueden borrar" msgid " The " msgstr " El " -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:51 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:55 msgid "Access to the system" msgstr "Acceso al sistema" -#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:61 +#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:48 msgid "Probability" msgstr "Probabilidad" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:104 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:203 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:183 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:190 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:86 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:207 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:218 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:156 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:178 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:186 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:159 msgid "Click on " msgstr "Click en" @@ -5741,6 +5829,10 @@ msgstr "Click en" msgid "Report data" msgstr "Datos del informe" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:305 +msgid "UserId:" +msgstr "UserId:" + #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:44 msgid "External load" msgstr "Carga externa" @@ -5749,6 +5841,10 @@ msgstr "Carga externa" msgid "Progress sent successfully" msgstr "El progreso se envió con éxito" +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:113 +msgid "Order elements" +msgstr "Elementos de pedido" + #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/InstanceNotFoundRecoverableErrorException.java:46 msgid "instance not found" msgstr "instancia no encontrada" @@ -5757,16 +5853,20 @@ msgstr "instancia no encontrada" msgid "Priority" msgstr "Prioridad" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:207 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:70 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:219 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:80 msgid "Infinitely Over Assignable" msgstr "Sobreasignable infinitamente" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:425 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47 +msgid "Apply changes and continue edition" +msgstr "Aplicar cambios y continuar la edición" + +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:426 msgid "criterion names must be unique inside a criterion type" msgstr "el nombre del criterio debe ser único dentro de un tipo de criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:735 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:790 msgid "" "The periods available depend on the satisfaction of the criteria by the " "resources and their calendars." @@ -5774,52 +5874,53 @@ msgstr "" "Los períodos disponibles dependen de la satisfacción de criterios por los " "recursos y sus calendarios." -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:814 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:824 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:79 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:85 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:65 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:132 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:52 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:59 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:186 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:287 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:44 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:131 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:54 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:54 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:189 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:264 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:45 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:37 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:26 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:69 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:71 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:38 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:46 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:47 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:27 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:47 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:76 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:49 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:79 #: libreplan-webapp/src/main/webapp/materials/materials.zul:59 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:81 -#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:36 -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66 -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:76 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:49 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:37 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:80 +#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:37 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:65 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:75 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:51 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:38 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:39 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:39 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:76 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:40 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:40 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:40 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:41 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:26 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:114 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 #: libreplan-webapp/src/main/webapp/orders/_list.zul:29 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:76 #: libreplan-webapp/src/main/webapp/templates/templates.zul:85 #: libreplan-webapp/src/main/webapp/templates/_list.zul:26 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:90 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:95 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:99 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:120 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:86 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:91 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:95 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:116 msgid "Code" msgstr "Código" -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:41 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:40 msgid "Add stretch" msgstr "Añadir tramo" @@ -5831,7 +5932,7 @@ msgstr "Mostrar las asignaciones de recursos" msgid "Assignation type" msgstr "Tipo de asignación" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:387 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:367 msgid "Calculate Workable Days" msgstr "Calcular días laborables" @@ -5843,16 +5944,16 @@ msgstr "" "La fecha de inicio no es válida, la fecha de inicio nueva debe ser anterior " "a la fecha de fin" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 -#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:55 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:96 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:57 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:100 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:121 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 +#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:42 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:92 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:53 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:96 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:117 msgid "Start date" msgstr "Fecha de inicio" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:168 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:171 msgid "Update exception" msgstr "Actualizar excepción" @@ -5865,8 +5966,7 @@ msgstr "No se puede efectuar la operación" msgid "Budget" msgstr "Presupuesto" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:65 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "May" msgstr "Mayo" @@ -5874,7 +5974,7 @@ msgstr "Mayo" msgid "Already exists other criterion with the same name" msgstr "Ya existe otro criterio con el mismo nombre" -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:37 +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:38 msgid "Unit name" msgstr "Nombre de la unidad" @@ -5883,10 +5983,6 @@ msgstr "Nombre de la unidad" msgid "Write" msgstr "Escribir" -#: libreplan-webapp/src/main/webapp/labels/labelTypes.zul:21 -msgid "LibrePlan: Labels" -msgstr "LibrePlan: Etiquetas" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderBandboxFinder.java:44 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 @@ -5895,7 +5991,7 @@ msgstr "LibrePlan: Etiquetas" msgid "Project code" msgstr "Código del proyecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:499 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:503 msgid "Assign element to queue automatically" msgstr "Asignar elemento a la cola automáticamente" @@ -5911,32 +6007,27 @@ msgstr "" "Fecha después de la cual la tarea debe empezar (presione enter en el cuadro " "de texto para abrir el calendario o escriba la fecha directamente)" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:326 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:603 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:596 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:43 msgid "Normal" msgstr "Normal" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:317 msgid "Date cannot be null" msgstr "La fecha no puede ser nula" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:765 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:169 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:108 +msgid "Project view" +msgstr "Vista de proyecto" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:774 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:166 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:76 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:142 msgid "Task Code" msgstr "Código de la tarea" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:157 -msgid "Project view" -msgstr "Vista de proyecto" - -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:96 -msgid "Create Profile" -msgstr "Crear perfil" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:747 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:655 msgid "This label type already is assigned to the work report type." msgstr "Este tipo de etiqueta ya está asignado al tipo de parte de trabajo." @@ -5951,50 +6042,48 @@ msgstr "Probabilidad %" msgid "New criterion" msgstr "Criterio nuevo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:730 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:346 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:542 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:700 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:325 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:813 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49 msgid "Load" msgstr "Carga" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:937 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:60 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:682 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:62 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:65 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:82 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:47 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:67 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:81 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:49 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:41 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:43 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:59 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:120 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:101 #: libreplan-webapp/src/main/webapp/templates/_list.zul:32 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 msgid "Description" msgstr "Descripción" -#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:24 -msgid "LibrePlan: Criteria" -msgstr "LibrePlan: Criterios" +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:39 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:45 +msgid "Apply" +msgstr "Aplicar" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:117 -msgid "Go to advanced Allocation" -msgstr "Ir a asignación avanzada" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:660 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:671 msgid "already exists an allocation for criteria {0}" msgstr "ya existe una asignación para los criterios {0}" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:283 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:287 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288 msgid "Project Templates" msgstr "Plantillas de proyectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339 msgid "Forward" msgstr "Adelante" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:465 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:469 msgid "Invalid queue element" msgstr "elemento de cola inválido" @@ -6008,21 +6097,22 @@ msgstr "Número de aplicaciones finalizadas" msgid "Unnasigned" msgstr "No asignado" -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:61 -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:70 -#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:163 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:179 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:74 +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:165 msgid "User" msgstr "Usuario" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405 msgid "At least one HoursGroup is needed" msgstr "Es necesario al menos un grupo de horas" -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:69 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:71 msgid "Interacts with applications" msgstr "Interactúa con aplicaciones" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:257 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:289 msgid "Virtual worker" msgstr "Trabajador virtual" @@ -6030,7 +6120,7 @@ msgstr "Trabajador virtual" msgid "Length percentage should be between 0 and 100" msgstr "El porcentaje de duración debería estar entre 0 y 100" -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:48 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:50 msgid "Multiple values per resource" msgstr "Múltiples valores por recurso" @@ -6043,13 +6133,13 @@ msgstr "Horas:" msgid "Split" msgstr "Dividir" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:101 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:100 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:106 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:105 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:107 msgid "please, select a project" msgstr "por favor, seleccione un proyecto" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:118 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:122 msgid "Supported Chrome, Firefox, Safari and Epiphany browsers" msgstr "Compatible con navegadores Chrome, Firefox, Safari y Epiphany" @@ -6059,14 +6149,14 @@ msgstr "Compatible con navegadores Chrome, Firefox, Safari y Epiphany" #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:45 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:50 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:56 #: libreplan-webapp/src/main/webapp/orders/_list.zul:30 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:94 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:51 msgid "Starting date" msgstr "Fecha de inicio" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:64 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:63 msgid "Add materials" msgstr "Añadir materiales" @@ -6074,66 +6164,61 @@ msgstr "Añadir materiales" msgid "Load 100%" msgstr "Carga 100%" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:991 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:934 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:84 msgid "Function" msgstr "Función" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:775 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:394 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:745 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:364 msgid "date in future" msgstr "fecha en el futuro" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:654 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:630 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:851 msgid "New project version" msgstr "Nueva versión de proyecto" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:82 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:183 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:198 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:161 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:139 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:160 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:168 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:141 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:187 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:194 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:135 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:156 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:164 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:137 msgid "Format" msgstr "Formato" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:174 -msgid "Edit Unit Type" -msgstr "Editar tipo de unidad" - -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:332 -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:474 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1249 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:472 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:364 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1226 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:483 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:77 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:532 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:537 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:78 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:37 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:104 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:33 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:40 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:27 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:28 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:42 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:44 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:37 -#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:24 +#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:25 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:47 -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:25 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:25 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:49 +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:26 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:26 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:42 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:37 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:35 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:39 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:41 #: libreplan-webapp/src/main/webapp/templates/_list.zul:48 msgid "Edit" msgstr "Editar" -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81 msgid "Init date" msgstr "Fecha de inicio" @@ -6141,7 +6226,15 @@ msgstr "Fecha de inicio" msgid "Responsible" msgstr "Responsable" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:457 +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:60 +msgid "New password" +msgstr "Nueva contraseña" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:263 +msgid "Port:" +msgstr "Puerto:" + +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:352 msgid "percentage must be in range (0,100]" msgstr "el porcentaje debe pertenecer al rango (0,100]" @@ -6150,7 +6243,7 @@ msgstr "el porcentaje debe pertenecer al rango (0,100]" msgid "New Description" msgstr "Descripción nueva" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1154 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1150 msgid "" "resources cost category assignment codes must be unique inside a resource" msgstr "" @@ -6171,22 +6264,23 @@ msgstr "" "satisfecho con el mismo tipo" #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/ResourceEnumConverter.java:61 +#: libreplan-webapp/src/main/java/org/libreplan/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java:85 msgid "Unable to convert {0} value to {1} type" msgstr "No se pudo convertir el valor {0} al tipo {1}" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:198 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:114 msgid "Tree {0} sucessfully flattened" msgstr "Árbol {0} aplanado satisfactoriamente" -#: libreplan-webapp/src/main/webapp/materials/materials.zul:83 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:82 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:30 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:119 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 msgid "Unit price" msgstr "Precio de la unidad" #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:72 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:68 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 msgid "Project Code" msgstr "Código del proyecto" @@ -6198,17 +6292,11 @@ msgstr "Fecha de comunicación" msgid "Reassigning" msgstr "Reasignando" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:588 -msgid "" -"Cannot delete that cost category because there are resources assigned to it." -msgstr "" -"No se puede borrar la categoría de coste porque hay recursos asignados a " -"ella." - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:633 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:644 msgid "{0} already assigned to resource allocation list" msgstr "{0} ya está en la lista de asignación de recursos" +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:184 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:27 msgid "Unit Measure" msgstr "Unidad de medida" @@ -6224,14 +6312,13 @@ msgstr "Lista de Tipos de Etiqueta" #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:42 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:64 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:128 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:46 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:98 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:232 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:127 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:47 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:101 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:27 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:42 -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:59 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:77 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:44 +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:61 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42 @@ -6241,25 +6328,25 @@ msgstr "Lista de Tipos de Etiqueta" #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:36 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:33 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:119 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:161 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:137 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:178 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:140 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:99 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:140 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:107 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:148 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:83 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:123 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:165 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:133 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:174 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:95 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:95 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:136 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:103 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:144 msgid "Type" msgstr "Tipo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:346 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:347 msgid "{0} projects reassignation remaining" msgstr "quedan {0} proyectos por reasignar" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:637 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:542 msgid "" "This machine cannot be deleted because it has assignments to projects or " "imputed hours" @@ -6267,13 +6354,16 @@ msgstr "" "Esta máquina no se puede borrar porque tiene asignaciones a proyectos u " "horas imputadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:71 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45 msgid "November" msgstr "Noviembre" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1288 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1310 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:89 +msgid "Enable/Disable" +msgstr "Habilitar/Deshabilitar" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1282 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1304 msgid "" "Value is not valid, the value must be greater than the value of the previous " "progress." @@ -6289,58 +6379,56 @@ msgstr "BCWS" msgid " in the specified directory." msgstr " en el directorio especificado." -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1148 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1144 msgid "criterion satisfaction codes must be unique inside a resource" msgstr "el código del criterio debe ser único dentro de un recurso" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:668 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:862 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:865 msgid "no" msgstr "no" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:360 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:347 msgid "missing code in a work report." msgstr "falta el código en un parte de trabajo." #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnum.java:29 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:29 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementFilterEnum.java:36 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:85 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:105 msgid "Criterion" msgstr "Criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:94 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:103 msgid "unl" msgstr "ili" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:76 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:290 +msgid "Test LDAP connection" +msgstr "Probar la conexión con el LDAP" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:96 msgid "Generate code for" msgstr "Generar código para" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:397 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:481 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:384 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:468 #: libreplan-webapp/src/main/java/org/libreplan/ws/labels/impl/LabelConverter.java:103 msgid "missing code in a label" msgstr "falta el código en una etiqueta" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:139 -msgid "is not supported for its use with LibrePlan." -msgstr "no está soportado para su uso con LibrePlan." - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:123 msgid "Actual Cost Work Performed" msgstr "Coste de trabajo realizado" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:185 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:172 msgid "Create project from Template" msgstr "Crear proyecto a partir de plantilla" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310 -msgid "LibrePlan Configuration" -msgstr "LibrePlan: Configuración" - -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:406 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:417 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" @@ -6350,10 +6438,6 @@ msgstr "" " El código no puede contener caracteres como '_' \n" " y no debe ser vacío" -#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:51 -msgid "Average of the worked hours" -msgstr "Media de horas trabajadas" - #: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorization.java:43 msgid "an authorization type must be set" msgstr "debe seleccionar un tipo de autorización" @@ -6362,8 +6446,7 @@ msgstr "debe seleccionar un tipo de autorización" msgid "Must start after (days since beginning project)" msgstr "Debe empezar después de (días desde el inicio del proyecto)" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:653 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:629 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:850 msgid "" "Confirm creating a new project version for this scenario and derived. Are " "you sure?" @@ -6371,58 +6454,62 @@ msgstr "" "Confirmar la creación de una nueva versión del proyecto para este escenario " "y sus derivados. ¿Está seguro?" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:150 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:156 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:29 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:68 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:44 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:74 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:72 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:45 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:73 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:59 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:66 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:77 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:109 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:150 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:167 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:88 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:129 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:88 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:88 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:129 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:96 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:137 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:73 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:105 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:154 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:80 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:122 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:163 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:84 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:84 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:84 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:125 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:92 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:133 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:105 msgid "Add" msgstr "Añadir" -#: libreplan-webapp/src/main/webapp/materials/materials.zul:47 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:44 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:85 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:124 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:48 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:82 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:120 msgid "Unselect" msgstr "Deseleccionar" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:617 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:609 msgid "You should select the type of exception" msgstr "Debe seleccionar el tipo de excepción" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:93 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:56 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:62 #: libreplan-webapp/src/main/webapp/orders/_list.zul:31 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:99 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46 msgid "Deadline" msgstr "Fecha límite" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:336 +msgid "Group path:" +msgstr "Path del grupo:" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 msgid "Subcontracted Tasks" msgstr "Tareas subcontratadas" -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:122 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:118 msgid "Filter by categories or materials" msgstr "Filtrar por categorías o materiales" @@ -6430,7 +6517,7 @@ msgstr "Filtrar por categorías o materiales" msgid "Amount work percentage should be between 0 and 100" msgstr "El porcentaje de cantidad de trabajo debe estar entre 0 y 100" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:29 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:30 msgid "Machine data" msgstr "Datos de la máquina" @@ -6438,19 +6525,18 @@ msgstr "Datos de la máquina" msgid "VAC" msgstr "VAC" -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:28 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:29 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:34 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:55 msgid "Label type" msgstr "Tipo de etiqueta" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:246 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:319 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:243 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:156 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:236 msgid "Advanced Allocation" msgstr "Asignación avanzada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:309 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310 msgid "Administration / Management" msgstr "Administración / Gestión" @@ -6462,8 +6548,8 @@ msgstr "Número de iteraciones" msgid "Template Tree" msgstr "Árbol de plantillas" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:499 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:34 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:447 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 msgid "Alpha" msgstr "Alfa" @@ -6476,20 +6562,20 @@ msgstr "El criterio tiene subelementos" msgid "inconsistent parent code." msgstr "código padre inconsistente." +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:430 +msgid "effort is not properly calculated based on clock" +msgstr "el esfuerzo no está bien calculado basándose en el reloj" + #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:33 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:67 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:63 msgid "Status" msgstr "Estado" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:163 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:111 msgid "Resource load view" msgstr "Vista de carga de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:763 -msgid "the date must be inside the visualization area" -msgstr "la fecha debe estar dentro del área de visualización" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:806 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:816 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:70 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:82 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/EffortDurationPicker.java:62 @@ -6498,32 +6584,40 @@ msgstr "la fecha debe estar dentro del área de visualización" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:154 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:35 #: libreplan-webapp/src/main/webapp/orders/_list.zul:34 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:69 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:76 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:72 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:81 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:72 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:54 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:34 msgid "Hours" msgstr "Horas" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:54 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:733 +msgid "the date must be inside the visualization area" +msgstr "la fecha debe estar dentro del área de visualización" + +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:56 msgid "Quality form type" msgstr "Tipo de formulario de calidad" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:405 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:392 msgid "work report has not this label type assigned" msgstr "el parte de trabajo no tiene asignado este tipo de etiqueta" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1230 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1192 msgid "Limiting assignment" msgstr "Asignación limitante" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:522 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:523 msgid "date not specified." msgstr "fecha no especificada." -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:360 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:318 +msgid "{0} \"{1}\" deleted" +msgstr "{0} \"{1}\" borrado" + +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:364 msgid " hours" msgstr " horas" @@ -6531,43 +6625,40 @@ msgstr " horas" msgid "The name of the criterion is empty." msgstr "El nombre del criterio está vacío." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:281 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:134 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:147 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:132 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:145 msgid "Limiting Resources Planning" msgstr "Asignación de recursos limitantes" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:770 -msgid "The max value must be not empty" -msgstr "el valor máximo no puede ser vacío" - -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:66 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:69 msgid "New label" msgstr "Nueva etiqueta" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:134 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:137 msgid "Worker ID cannot be empty" msgstr "NIF del trabajador no especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:177 -msgid "All project tasks" -msgstr "Todas las tareas del proyecto" - #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:343 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:352 msgid "The start date cannot be null" msgstr "La fecha de inicio no puede ser nula" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:31 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:188 +msgid "All project tasks" +msgstr "Todas las tareas del proyecto" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:367 +msgid "LDAP Roles (separated by ;)" +msgstr "Roles del LDAP (separados por ;)" + #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:78 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:27 msgid "Allocation configuration" msgstr "Configuración de asignación" -#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:125 -msgid "Scenario \"{0}\" saved" -msgstr "Escenario \"{0}\" guardado" - -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:215 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:209 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:189 msgid "Save & New work report" msgstr "Guardar y nuevo parte de trabajo" @@ -6576,39 +6667,39 @@ msgstr "Guardar y nuevo parte de trabajo" msgid "Subcontract price" msgstr "Precio de subcontratación" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:744 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:799 msgid "Resources per day are zero" msgstr "Hay cero recursos por día" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:30 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:31 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32 msgid "Assigned criteria" msgstr "Criterios asignados" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:53 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:57 msgid "Help on authentication (opens a new window)" msgstr "Ayuda sobre la identificación (abre una ventana nueva)" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:870 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:778 msgid "The length must be greater than 0, and not null." msgstr "La longitud debe ser mayor que cero y no nula." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:39 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:54 msgid "Not a valid effort duration" msgstr "No es una duración de esfuerzo válida" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:544 +#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:199 +msgid "Cannot remove the predefined Exception Day Type \"{0}\"" +msgstr "No se puede el tipo de día de excepción predefinido \"{0}\"" + +#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:34 +msgid "Base calendar type" +msgstr "Tipo de calendario base" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:613 msgid "Could not save new calendar" msgstr "No se pudo guardar el calendario nuevo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1467 -msgid "Sigmoid function applied to current resource" -msgstr "Función sigmoide aplicada al recurso actual" - -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:160 -msgid "Deleted unit type {0}" -msgstr "Borrado tipo de unidad {0}" - #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:224 msgid "Could not save the scenario" msgstr "No se pudo guardar el escenario" @@ -6617,43 +6708,40 @@ msgstr "No se pudo guardar el escenario" msgid "Couldn't find criterion {0}" msgstr "No se pudo encontrar el criterio {0}" -#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:37 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:36 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:33 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:35 msgid "Apply filtering to tasks satisfying required criteria" msgstr "Aplicar filtrado a las tareas que satisfacen los criterios requeridos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:37 msgid "Task Scheduling Status In Project" msgstr "Estado de planificación de tareas en un proyecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:200 -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:421 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:345 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:373 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:194 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:887 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:261 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:863 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:356 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313 msgid "Confirm" msgstr "Confirmar" #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:56 -#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:32 -#: libreplan-webapp/src/main/webapp/calendars/_list.zul:32 +#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:55 +#: libreplan-webapp/src/main/webapp/calendars/_list.zul:35 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:43 -#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:51 +#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:52 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:45 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:57 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:48 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:32 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:58 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:33 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:61 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:40 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:55 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:49 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:49 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:52 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:54 msgid "Create" msgstr "Crear" @@ -6662,76 +6750,76 @@ msgstr "Crear" msgid "Permissions" msgstr "Permisos" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1728 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1734 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1716 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1722 msgid "please, select a work report type" msgstr "por favor, seleccione un tipo de parte de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:486 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:487 msgid "List of materials for category: {0}" msgstr "Lista de materiales para la categoría {0}" +#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36 +msgid "Cancel edition" +msgstr "Cancelar la edición" + #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:31 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 msgid "Total price" msgstr "Precio total" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:436 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1230 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1242 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:786 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1044 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1295 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:419 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:625 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:46 +msgid "Labels without inheritance" +msgstr "Etiquetas sin herencia" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1214 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:886 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1207 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1454 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:451 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:324 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:138 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:818 -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:126 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:271 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:223 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:362 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:530 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:544 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:272 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:293 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:289 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:163 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:223 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:306 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1265 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1242 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1204 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:332 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:405 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:694 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1207 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:201 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:333 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:406 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:646 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:408 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:948 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:954 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:232 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:955 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:961 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:264 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:84 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:69 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:117 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:132 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:70 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:118 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:133 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:88 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:45 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:46 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:49 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:92 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99 #: libreplan-webapp/src/main/webapp/materials/materials.zul:104 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:115 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:117 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:54 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:66 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:90 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:120 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:68 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:107 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:137 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:40 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:44 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:46 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:213 @@ -6740,19 +6828,19 @@ msgstr "Precio total" #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67 #: libreplan-webapp/src/main/webapp/templates/_list.zul:53 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:129 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:171 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:106 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:147 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:188 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:109 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:150 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:110 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:109 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:150 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:117 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:158 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:133 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:175 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:102 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:143 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:184 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:105 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:106 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:105 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:146 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:113 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:154 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:127 msgid "Delete" msgstr "Borrar" @@ -6776,43 +6864,99 @@ msgstr "cabecera" msgid "line" msgstr "línea" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:150 +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:34 +msgid "Use browser language configuration" +msgstr "Utilizar la configuración de idioma del navegador" + +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:35 +msgid "Galician" +msgstr "Gallego" + +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:36 +msgid "Spanish" +msgstr "Español" + +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:37 +msgid "English" +msgstr "Inglés" + +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:38 +msgid "Russian" +msgstr "Ruso" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:172 msgid "unlimited" msgstr "ilimitado" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:83 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99 msgid "Monday" msgstr "Lunes" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:83 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99 msgid "Tuesday" msgstr "Martes" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:83 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99 msgid "Wednesday" msgstr "Miércoles" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:84 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100 msgid "Thursday" msgstr "Jueves" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:84 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100 msgid "Friday" msgstr "Viernes" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:84 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100 msgid "Saturday" msgstr "Sábado" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:85 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:101 msgid "Sunday" msgstr "Domingo" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:135 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:31 +msgid "red (default)" +msgstr "rojo (defecto)" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:32 +msgid "green" +msgstr "verde" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:33 +msgid "blue" +msgstr "azul" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:34 +msgid "cyan" +msgstr "cian" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:35 +msgid "magenta" +msgstr "magenta" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:36 +msgid "yellow" +msgstr "amarillo" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:37 +msgid "black" +msgstr "negro" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:38 +msgid "orange" +msgstr "naranja" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:39 +msgid "purple" +msgstr "púrpura" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139 msgid "Yes" msgstr "Sí" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:135 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139 msgid "No" msgstr "No" @@ -6820,35 +6964,19 @@ msgstr "No" msgid "STRATEGIC RESOURCE" msgstr "RECURSO ESTRATÉGICO" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:37 -msgid "WORK_RELATIONSHIP" -msgstr "RELACIÓN_DE_TRABAJO" +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:39 +msgid "LOCATION" +msgstr "LOCALIZACIÓN" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:43 -msgid "LOCATION_GROUP" -msgstr "GRUPO_DE_LOCALIZACIÓN" - -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:50 -msgid "MACHINE LOCATION_GROUP" -msgstr "GRUPO_DE_LOCALIZACIÓN DE MÁQUINAS" - -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:58 -msgid "LEAVE" -msgstr "BAJA" - -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:64 -msgid "TRAINING" -msgstr "FORMACIÓN" - -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:70 -msgid "JOB" -msgstr "TRABAJO" - -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:76 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:46 msgid "CATEGORY" msgstr "CATEGORÍA" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:206 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:53 +msgid "SKILL" +msgstr "HABILIDAD" + +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:207 msgid "[generic all machines]" msgstr "[genérico todas las máquinas]" @@ -6888,15 +7016,15 @@ msgstr "por porcentaje" msgid "by items" msgstr "por items" -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:107 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:109 msgid "Hours cost type cannot be empty or null" msgstr "Tipo de coste de horas no puede ser vacío o nulo" -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:116 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:118 msgid "Init date cannot be empty or null" msgstr "La fecha de inicio no puede ser vacía o nula" -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:121 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:123 msgid "End date cannot be empty or null" msgstr "La fecha de fin no puede ser vacía o nula" @@ -6940,7 +7068,7 @@ msgstr "" "El valor de las horas de trabajo no es válido, teniendo en cuenta la lista " "actual de grupos de horas" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:577 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:618 msgid "" "Some ancestor has the same label assigned, so this element is already " "inheriting this label" @@ -6948,17 +7076,17 @@ msgstr "" "Algún ancestro tiene la misma etiqueta asignada, por lo que este elemento ya " "está heredando esa etiqueta" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:676 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:717 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:963 msgid "Cannot spread two progress in the same task" msgstr "No pueden propagar dos progresos en la misma tarea" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:700 -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:726 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:741 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:767 msgid "Duplicate Progress Assignment For Task" msgstr "Asignación de progreso duplicada para la tarea" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1053 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1094 msgid "Quality form already exists" msgstr "El formulario de calidad ya existe" @@ -7060,14 +7188,18 @@ msgid "You can not modifiy this entity sequence, it is already in use" msgstr "No puede modificar esta secuencia de entidade, ya está en uso" #: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:36 +msgid "Spreading progress" +msgstr "Progreso que propaga" + +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:37 msgid "Progress with all tasks by hours" msgstr "Progreso con todas las tareas por horas" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:37 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:38 msgid "Progress with critical path tasks by hours" msgstr "Progreso con las tareas en el camino crítico por horas" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:38 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:39 msgid "Progress with critical path tasks by duration" msgstr "Progreso con las tareas del camino crítico por duración" @@ -7088,19 +7220,19 @@ msgstr "Envío fallido" msgid "Success sent" msgstr "Envío exitoso" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:58 -msgid "None" -msgstr "Ninguno" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:76 +msgid "Flat" +msgstr "Plano" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:59 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:78 msgid "Stretches" msgstr "Tramos" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:60 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:79 msgid "Interporlation" msgstr "Interpolación" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:61 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:80 msgid "Sigmoid" msgstr "Sigmoide" @@ -7189,6 +7321,282 @@ msgid "A queue dependency has to have an origin different from destiny" msgstr "" "Una dependencia de la cola tiene que ter un origen diferente de su destino" +#~ msgid "Up to company view" +#~ msgstr "Arriba a la vista de la compañía" + +#~ msgid "login name not specified" +#~ msgstr "nombre de usuario no especificado" + +#~ msgid "Progress Consolidation" +#~ msgstr "Consolidación de progreso" + +#~ msgid "" +#~ "The first stretch must be after the first day for doing interpolation" +#~ msgstr "" +#~ "El primer tramo debe estar después del primer día para hacer interpolación" + +#~ msgid "Cannot delete user: it does not exist anymore" +#~ msgstr "No se puede borrar el usuario: ya no existe" + +#~ msgid "Machine deleted" +#~ msgstr "Máquina borrada" + +#~ msgid "Create new version" +#~ msgstr "Crear versión nueva" + +#~ msgid "Derived" +#~ msgstr "Derivado" + +#~ msgid "" +#~ "You can not remove the company \"{0}\" because is already in use in some " +#~ "project or in some subcontrated task." +#~ msgstr "" +#~ "No puede borrar la empresa \"{0}\" porque está siendo utilizada en ulgún " +#~ "proyecto o en alguna tarea subcontrada." + +#~ msgid "Error setting up creation form." +#~ msgstr "Error preparando el formulario de creación." + +#~ msgid "Project does not exist" +#~ msgstr "El proyecto no existe" + +#~ msgid "Edit Scenario" +#~ msgstr "Editar escenario" + +#~ msgid "Confirm deleting this cost category. Are you sure?" +#~ msgstr "Confirmar el borrado de esta categoría de coste. ¿Está seguro?" + +#~ msgid "Error removing element: " +#~ msgstr "Error al borrar elemento: " + +#~ msgid "Create Criterion Type" +#~ msgstr "Crear tipo de criterio" + +#~ msgid "It not could remove the task " +#~ msgstr "No se pudo borrar la tarea" + +#~ msgid "Create Work Hours Type" +#~ msgstr "Crear tipo de horas de trabajo" + +#~ msgid "CriterionType and its criteria saved" +#~ msgstr "Tipo de criterio y sus criterios guardados" + +#~ msgid "Error on removing typeOfWorkHours: " +#~ msgstr "Error al borrar tipo de horas de trabajo: " + +#~ msgid "password not specified" +#~ msgstr "contraseña no especificada" + +#~ msgid "Edit Company" +#~ msgstr "Editar empresa" + +#~ msgid "Profile saved" +#~ msgstr "Perfil guardado" + +#~ msgid "You need to select some function to configure" +#~ msgstr "Necesita seleccionar alguna función para configurar" + +#~ msgid "there must be {0} effort instead of {1}" +#~ msgstr "debe haber {0} esfuerzo en lugar de {1}" + +#~ msgid "The cost category had already been removed." +#~ msgstr "La categoría de coste ya había sido borrada." + +#~ msgid "Create Scenario" +#~ msgstr "Crear escenario" + +#~ msgid "Delete item. Are you sure?" +#~ msgstr "Borrar elemento. ¿Está seguro?" + +#~ msgid "Create Label Type" +#~ msgstr "Crear tipo de etiqueta" + +#~ msgid "Create Work Report Type" +#~ msgstr "Crear tipo de parte de trabajo" + +#~ msgid "incorrect initialization of the progress assignment controller." +#~ msgstr "" +#~ "inicialización incorrecta del controlador de asignación de progreso." + +#~ msgid "Error setting up creation form for Criterion Type" +#~ msgstr "Error preparando el formulario de creación para un tipo de criterio" + +#~ msgid "Edit Cost Category" +#~ msgstr "Editar categoría de coste" + +#~ msgid "Confirm deleting this machine. Are you sure?" +#~ msgstr "Confirmar el borrado de esta máquina. ¿Está seguro?" + +#~ msgid "Edit Profile" +#~ msgstr "Editar perfil" + +#~ msgid "Edit Progress Type" +#~ msgstr "Editar tipo de progreso" + +#~ msgid "Company saved" +#~ msgstr "Empresa guardada" + +#~ msgid "Type of work hours saved" +#~ msgstr "Tipo de horas de trabajo guardado" + +#~ msgid "Create Quality Form" +#~ msgstr "Crear formulario de calidad" + +#~ msgid "Error setting up edition form." +#~ msgstr "Error preparando el formulario de edición." + +#~ msgid "Cost category saved" +#~ msgstr "Categoría de coste guardada" + +#~ msgid "Progress type saved" +#~ msgstr "Tipo de progreso guardado" + +#~ msgid "Select the date from which the new version will be valid" +#~ msgstr "" +#~ "Seleccione la fecha a partir de la cual la versión nueva será válida" + +#~ msgid "Edit Work Hours Type" +#~ msgstr "Editar tipo de horas de trabajo" + +#~ msgid "Machine saved" +#~ msgstr "Máquina guardada" + +#~ msgid "Create Cost Category" +#~ msgstr "Crear categoría de coste" + +#~ msgid "Cannot delete profile: it does not exist anymore" +#~ msgstr "No se puede borrar el perfil: ya no existe" + +#~ msgid "Edit Machine" +#~ msgstr "Editar máquina" + +#~ msgid "Edit User" +#~ msgstr "Editar usuario" + +#~ msgid "D" +#~ msgstr "D" + +#~ msgid "Sigmoid function" +#~ msgstr "Función sigmoide" + +#~ msgid "Create From Template" +#~ msgstr "Crear a partir de plantilla" + +#~ msgid "Create Exception Day Type" +#~ msgstr "Crear tipo de día de excepción" + +#~ msgid "Could not save machine" +#~ msgstr "No se pudo guardar la máquina" + +#~ msgid "Label type saved" +#~ msgstr "Tipo de etiqueta guardado" + +#~ msgid "Create Order" +#~ msgstr "Crear proyecto" + +#~ msgid "Create User" +#~ msgstr "Crear usuario" + +#~ msgid "Create new project from template" +#~ msgstr "Crear nuevo proyecto a partir de plantilla" + +#~ msgid "Error on removing workReportType: " +#~ msgstr "Error al borrar tipo de parte de trabajo: " + +#~ msgid "Edit Label Type" +#~ msgstr "Editar tipo de etiqueta" + +#~ msgid "Work report type saved" +#~ msgstr "Tipo de partes de trabajo guardado" + +#~ msgid "Edit Quality Form" +#~ msgstr "Editar formulario de calidad" + +#~ msgid "Confirm deleting this profile. Are you sure?" +#~ msgstr "Confirmar el borrado de este perfil. ¿Está seguro?" + +#~ msgid "Calendar Exception Type saved" +#~ msgstr "Tipo de excepción de calendario guardado" + +#~ msgid "Quality form saved" +#~ msgstr "Formulario de calidad guardado" + +#~ msgid "Create Unit Type" +#~ msgstr "Crear tipo de unidad" + +#~ msgid "Confirm deleting this User. Are you sure?" +#~ msgstr "Confirmar el borrado de este usuario. ¿Está seguro?" + +#~ msgid "Edit Exception Day Type" +#~ msgstr "Editar tipo de día de excepción" + +#~ msgid "Unit type saved" +#~ msgstr "Tipo de unidad guardado" + +#~ msgid "Create Machine" +#~ msgstr "Crear máquina" + +#~ msgid "Create Company" +#~ msgstr "Crear empresa" + +#~ msgid "Choosing Template" +#~ msgstr "Selección de plantilla" + +#~ msgid "Edit Criterion Type" +#~ msgstr "Editar tipo de criterio" + +#~ msgid "Label saved" +#~ msgstr "Etiqueta guardada" + +#~ msgid "login name is already being used by another user" +#~ msgstr "el nombre de usuario ya está siendo usado" + +#~ msgid "Advanced assignment saved" +#~ msgstr "Asignación avanzada guardada" + +#~ msgid "Create Profile" +#~ msgstr "Crear perfil" + +#~ msgid "Go to advanced Allocation" +#~ msgstr "Ir a asignación avanzada" + +#~ msgid "Edit Unit Type" +#~ msgstr "Editar tipo de unidad" + +#~ msgid "" +#~ "Cannot delete that cost category because there are resources assigned to " +#~ "it." +#~ msgstr "" +#~ "No se puede borrar la categoría de coste porque hay recursos asignados a " +#~ "ella." + +#~ msgid "Average of the worked hours" +#~ msgstr "Media de horas trabajadas" + +#~ msgid "Sigmoid function applied to current resource" +#~ msgstr "Función sigmoide aplicada al recurso actual" + +#~ msgid "Deleted unit type {0}" +#~ msgstr "Borrado tipo de unidad {0}" + +#~ msgid "WORK_RELATIONSHIP" +#~ msgstr "RELACIÓN_DE_TRABAJO" + +#~ msgid "MACHINE LOCATION_GROUP" +#~ msgstr "GRUPO_DE_LOCALIZACIÓN DE MÁQUINAS" + +#~ msgid "LEAVE" +#~ msgstr "BAJA" + +#~ msgid "TRAINING" +#~ msgstr "FORMACIÓN" + +#~ msgid "JOB" +#~ msgstr "TRABAJO" + +#~ msgid "None" +#~ msgstr "Ninguno" + #~ msgid "Derived from {0}" #~ msgstr "Derivado de {0}" diff --git a/libreplan-webapp/src/main/resources/i18n/gl.po b/libreplan-webapp/src/main/resources/i18n/gl.po index 3d6fb6703..3c333c8a8 100644 --- a/libreplan-webapp/src/main/resources/i18n/gl.po +++ b/libreplan-webapp/src/main/resources/i18n/gl.po @@ -1,19 +1,19 @@ -# Galician translations for LibrePlan package -# Traducciones al español para el paquete LibrePlan. +# Galician translations for LibrePlan - Webapp module +# Traducciones al español para Libreplan - módulo Webapp # Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e # Desenvolvemento Tecnolóxico de Galicia # Copyright (C) 2010-2011 Igalia, S.L. # This file is distributed under the same license as the LibrePlan package. # Jacobo Aragunde Pérez , 2009, 2010. -# Manuel Rego Casasnovas , 2010, 2011. +# Manuel Rego Casasnovas , 2010, 2011. # msgid "" msgstr "" -"Project-Id-Version: 1.1.0\n" +"Project-Id-Version: 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-09 16:17+0200\n" -"PO-Revision-Date: 2011-08-09 16:35+0200\n" -"Last-Translator: Manuel Rego Casasnovas \n" +"POT-Creation-Date: 2011-11-10 20:11+0100\n" +"PO-Revision-Date: 2011-11-10 21:26+0100\n" +"Last-Translator: Manuel Rego Casasnovas \n" "Language-Team: Galician <>\n" "Language: gl\n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:368 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:373 msgid "The resource cannot be null" msgstr "O recurso non pode ser nulo" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:419 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:420 msgid "criterion codes must be unique inside a criterion type" msgstr "o código do criterio debe ser único dentro dun tipo de criterio" @@ -34,71 +34,65 @@ msgid "No authorizations were added because you did not select any." msgstr "Non se engadiron actualizacións porque non se seleccionou ningunha." #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:88 -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:59 -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:45 -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:54 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:58 #: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:71 msgid "en" msgstr "gl" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:188 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:192 msgid "Origin" msgstr "Orixe" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:165 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:168 msgid "Create exception" msgstr "Crear excepción" -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:45 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:41 msgid "Select report data" msgstr "Seleccione data do informe" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:399 -msgid "Up to company view" -msgstr "Arriba á vista da compañía" - -#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:207 -msgid "there exist multiple resource calendars with name {0}" -msgstr "existen múltiples calendarios de recursos co nome {0}" - #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:60 msgid "Create Virtual Worker" msgstr "Crear traballador virtual" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:820 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:98 +#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:207 +msgid "there exist multiple resource calendars with name {0}" +msgstr "existen múltiples calendarios de recursos co nome {0}" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:830 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:105 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:36 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:52 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:28 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:135 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:137 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:159 -#: libreplan-webapp/src/main/webapp/calendars/_list.zul:28 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:269 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108 +#: libreplan-webapp/src/main/webapp/calendars/_list.zul:31 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:246 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:37 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:56 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:109 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:39 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:44 -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:39 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:26 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:29 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:44 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:37 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:40 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:140 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:28 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:81 #: libreplan-webapp/src/main/webapp/materials/materials.zul:61 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:87 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:86 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:29 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:88 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30 -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:69 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68 #: libreplan-webapp/src/main/webapp/scenarios/_list.zul:28 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:36 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:83 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:48 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:50 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70 @@ -110,45 +104,49 @@ msgstr "Crear traballador virtual" #: libreplan-webapp/src/main/webapp/templates/_list.zul:34 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:50 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:39 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:231 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:91 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:121 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:163 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:97 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:139 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:180 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:101 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:142 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:101 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:101 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:142 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:109 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:150 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:122 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:229 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:125 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:93 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:135 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:176 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:97 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:97 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:138 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:105 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:146 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:118 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:51 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:54 msgid "Operations" msgstr "Operacións" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:150 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:536 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:151 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:523 #: libreplan-webapp/src/main/java/org/libreplan/ws/costcategories/impl/CostCategoryConverter.java:135 #: libreplan-webapp/src/main/java/org/libreplan/ws/costcategories/impl/CostCategoryConverter.java:195 msgid "There is no type of work hours with this code" msgstr "Non hai un tipo de horas de traballo con este código" #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:84 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:107 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:112 msgid "Select" msgstr "Seleccionar" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1355 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:215 +msgid "Work report removed successfully" +msgstr "Parte de traballo borrado con éxito" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1514 msgid "It can not be empty" msgstr "Non pode estar baleiro" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:315 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 #: libreplan-webapp/src/main/webapp/materials/materials.zul:33 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:98 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:97 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:53 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:145 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:55 @@ -162,57 +160,57 @@ msgstr "Materiais" msgid "Reassign" msgstr "Reasignar" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:62 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:64 msgid "Description cannot be null or empty" msgstr "A descrición non pode ser nula ou baleira" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:79 -msgid "login name not specified" -msgstr "nome de usuario non especificado" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:79 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:362 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:72 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:269 msgid "MonteCarlo Method" msgstr "Método de Montecarlo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:310 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:229 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:247 msgid "Project Scheduling" msgstr "Planificación de proxecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:62 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 msgid "February" msgstr "Febreiro" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:28 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:29 msgid "Managing fields and labels" msgstr "Administrar campos e etiquetas" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:356 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:269 msgid "Please, select a calendar" msgstr "Por favor, seleccione un calendario" #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29 -#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:168 +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:170 msgid "Predefined" msgstr "Predefinido" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:267 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:244 msgid "Summary" msgstr "Resumo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:445 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 #: libreplan-webapp/src/main/webapp/templates/templates.zul:67 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53 msgid "Quality Forms" msgstr "Formularios de calidade" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:330 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 msgid "Reports" msgstr "Informes" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:337 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:22 +msgid "LibrePlan: Advanced allocation" +msgstr "LibrePlan: Asignación avanzada" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:340 msgid "" "The original workable days value {0}, is prevented because consolidated " "values cannot be modified" @@ -220,24 +218,24 @@ msgstr "" "O valor orixinal de días laborais {0}, evíatase porque os valores " "consolidados non poden ser modificados" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:163 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:172 msgid "The {0} sequence prefixes can not be repeated" msgstr "Os prefixos da secuencia de {0} non poden repetirse" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:81 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:82 msgid "Criterion requirements" msgstr "Criterios requiridos" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:287 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:285 msgid "Stretch date must not be less than task start date: " msgstr "A data do tramo debe ser maior ou igual cá data de inicio da tarefa: " -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:66 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:68 msgid "Dedication chart" msgstr "Gráfico de dedicación" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:701 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:728 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:702 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:729 msgid "Progress that are reported by quality forms can not be modified" msgstr "" "O progreso notificado por formularios de calidade non se pode modificar" @@ -246,33 +244,38 @@ msgstr "" msgid "Not the same hours group, impossible to update" msgstr "Non están no mesmo grupo de horas, imposible actualizar" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:520 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:66 +msgid "Own exception" +msgstr "Excepción propia" + +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:522 msgid "Cannot delete that material because it is assigned to a project." msgstr "Non se pode borrar ese material porque está asignado a un proxecto." -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:475 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:479 msgid "Remove limiting resource element" msgstr "Borrar elemento de recurso limitante" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:275 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:141 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:155 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:136 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:150 msgid "Resource Usage" msgstr "Uso de recursos" -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:39 +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:40 msgid "Active period from" msgstr "Período activo desde" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:52 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:51 msgid "hours type :" msgstr "tipo de horas :" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:481 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:485 msgid "Unassign" msgstr "Desasignar" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:295 +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:157 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:296 msgid "Companies" msgstr "Empresas" @@ -280,7 +283,7 @@ msgstr "Empresas" msgid "Manual assignment" msgstr "Asignación manual" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:73 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:75 msgid "Quality form items list" msgstr "Lista de elementos do formulario de calidade" @@ -291,16 +294,22 @@ msgid "" msgstr "" "A data de fin non é válida, a nova data de fin debe ser posterior á actual" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:518 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:903 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:128 +msgid "Create {0}: {1}" +msgstr "Crear {0}: {1}" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:51 msgid "generic workers allocation" msgstr "Asignación xenérica de traballadores" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:914 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:516 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:890 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:308 msgid "The project has no scheduled elements" msgstr "O proxecto no ten elementos planificados" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:796 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:806 msgid "Hour start" msgstr "Hora de inicio" @@ -322,11 +331,11 @@ msgstr "categoría da asignación de custo non especificada" msgid "Delete Template element" msgstr "Borrar elemento de modelo" -#: libreplan-webapp/src/main/webapp/planner/order.zul:90 -#: libreplan-webapp/src/main/webapp/planner/order.zul:97 -msgid "Progress Consolidation" -msgstr "Consolidación de progreso" +#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:22 +msgid "LibrePlan: Calendars" +msgstr "LibrePlan: Calendarios" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/services/LDAPUserDetailsService.java:65 #: libreplan-webapp/src/main/java/org/libreplan/web/users/services/DBUserDetailsService.java:66 msgid "User with login name '{0}': not found" msgstr "Usuario con login '{0}': non atopado" @@ -335,21 +344,16 @@ msgstr "Usuario con login '{0}': non atopado" msgid "Resources capability" msgstr "Capacidade de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:204 -msgid "The first stretch must be after the first day for doing interpolation" -msgstr "" -"O primeiro tramo debe estar despois do primeiro día para facer interpolación" - #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26 msgid "Filter quality forms by :" msgstr "Filtrar formularios de calidade por :" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:106 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:108 msgid "changing perspective" msgstr "cambio de perspectiva" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:32 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:31 msgid "Transfer Projects Between Scenarios" msgstr "Transferir proxectos entre escenarios" @@ -361,28 +365,24 @@ msgstr "" "Non se engadiron esas actualizacións ao perfil {0} porque xa estaban " "presentes." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:55 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:63 msgid "Default calendar" msgstr "Calendario por defecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:296 -msgid "Cannot delete user: it does not exist anymore" -msgstr "Non se pode borrar o usuario: xa non existe" - -#: libreplan-webapp/src/main/webapp/users/profiles.zul:23 -msgid "LibrePlan: Profiles" -msgstr "LibrePlan: Perfís" - #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:74 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 msgid "Project Name" msgstr "Nome do proxecto" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:931 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:938 msgid "Indent" msgstr "Indentar" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:312 +msgid "Save passwords in database" +msgstr "Gardar contrasinais na base de datos" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:255 msgid "Reassignation" msgstr "Reasignación" @@ -395,40 +395,53 @@ msgstr "Novo modelo" msgid "Total estimated hours" msgstr "Horas estimadas totais" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:130 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:144 +#: libreplan-webapp/src/main/webapp/common/event_error.zul:22 +#: libreplan-webapp/src/main/webapp/common/error.zul:21 +msgid "LibrePlan: Runtime Error" +msgstr "LibrePlan: Erro de execución" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:136 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:151 msgid "Base calendar \"{0}\" saved" msgstr "Calendario base \"{0}\" gardado" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:174 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:177 msgid "Exceptions list" msgstr "Lista de excepcións" -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:33 msgid "Locations" msgstr "Ubicacións" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:76 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:78 msgid "New quality form item" msgstr "Novo elemento de formulario de calidade" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:41 +#: libreplan-webapp/src/main/webapp/labels/labelTypes.zul:21 +msgid "LibrePlan: Labels" +msgstr "LibrePlan: Etiquetas" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:242 +msgid "LDAP connection was successful" +msgstr "A conexión co LDAP foi realizada con éxito" + +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:43 msgid "Login name" msgstr "Nome de usuario" +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:81 +msgid "LibrePlan user" +msgstr "Usuario de LibrePlan" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:84 +msgid "{0} List" +msgstr "{0} Lista" + #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:43 msgid "Current" msgstr "Actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:632 -msgid "Machine deleted" -msgstr "Máquina borrada" - -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:22 -msgid "LibrePlan: Progress Report" -msgstr "LibrePlan: Informe de progreso" - -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:67 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:63 msgid "Dependencies" msgstr "Dependencias" @@ -440,7 +453,7 @@ msgstr "falta código nunha excepción de calendario" msgid "Current selection" msgstr "Selección actual" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1134 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1130 msgid "" "there exist criterion satisfactions referring to criterion types not " "applicable to this resource" @@ -466,28 +479,36 @@ msgstr "Minutos" msgid "You can not remove a scenario with derived scenarios" msgstr "Non se pode borrar un escenario con escenarios derivados" -#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:23 -msgid "Create new version" -msgstr "Crear versión nova" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:948 +msgid "Work Report Types" +msgstr "Tipos de partes de traballo" + +#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:55 +msgid "Maximum/minimum of estimated hours" +msgstr "Máximo/mínimo de horas estimadas" + +#: libreplan-webapp/src/main/webapp/qualityforms/qualityForms.zul:22 +msgid "LibrePlan: Quality Forms" +msgstr "LibrePlan: Formularios de calidade" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/ResourceAllocationBehaviour.java:63 msgid "LIMITING" msgstr "LIMITANTE" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:324 -msgid "Derived" -msgstr "Derivado" - -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:414 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:415 msgid "a disabled resource has enabled subresources" msgstr "un recurso deshabilitado ten subrecursos habilitados" #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:51 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:53 msgid "Client" msgstr "Cliente" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:651 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:350 +msgid "Role search query:" +msgstr "Consulta para a búsqueda de roles:" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:662 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:153 msgid "" "there are no resources for required criteria: {0}. So the generic allocation " @@ -496,11 +517,11 @@ msgstr "" "non hai recursos cos criterios solicitados: {0}. Por tanto, non se pode " "engadir a asignación xenérica" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:446 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:478 msgid "Error on showing warning message removing calendar: " msgstr "Erro ao mostrar mensaxe de advertencia borrando un calendario: " -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:428 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:415 msgid "work report has not any description value with this field name" msgstr "" "o parte de traballo non ten ningún valor de descrición con ese nome de campo" @@ -515,12 +536,12 @@ msgstr "o nome da categoría de materiais debe ser único. Xa está en uso" msgid "Imputed hours" msgstr "Horas imputadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:37 msgid "Project Costs Per Resource" msgstr "Custos do proxecto por recurso" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:530 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 msgid "Confirm deleting this hour cost. Are you sure?" msgstr "Confirmar o borrado deste custo por hora. ¿Está seguro?" @@ -529,15 +550,19 @@ msgstr "Confirmar o borrado deste custo por hora. ¿Está seguro?" msgid "Delete Milestone" msgstr "Borrar fito" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:152 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:155 msgid "default password were not changed" msgstr "o contrasinal por defecto non foi cambiado" +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:112 +msgid "Type of hours" +msgstr "Tipo de horas" + #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:48 msgid "Non-assigned locations" msgstr "Ubicacións non asignadas" -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:75 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:77 msgid "Application URI" msgstr "URI da aplicación" @@ -549,21 +574,22 @@ msgstr "" "{0} non é válido, criterionType solápase con outro criterionSatisfaction do " "mesmo criterionType" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 msgid "Work Report Lines" msgstr "Liñas do parte de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1514 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1546 msgid "Configure" msgstr "Configurar" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:70 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45 msgid "October" msgstr "Outubro" +#: libreplan-webapp/src/main/webapp/settings/settings.zul:58 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:36 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:57 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:58 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:50 msgid "First name" msgstr "Nome" @@ -571,20 +597,16 @@ msgstr "Nome" msgid "Could not execute print command" msgstr "Non se puido executar o comando de impresión" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:119 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:122 msgid "Complementary text fields" msgstr "Campos de texto complementario" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:208 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1242 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:418 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:137 -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:141 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:291 -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:181 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:851 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:199 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:210 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:450 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:827 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 msgid "Confirm deleting {0}. Are you sure?" msgstr "Confirmar o borrado de {0}. ¿Está seguro?" @@ -592,7 +614,7 @@ msgstr "Confirmar o borrado de {0}. ¿Está seguro?" msgid "Work Reports List" msgstr "Lista de partes de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:313 msgid "Accounts" msgstr "Contas" @@ -600,7 +622,7 @@ msgstr "Contas" msgid "External code" msgstr "Código externo" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:48 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:50 msgid "Edit selected task" msgstr "Editar tarefa seleccionada" @@ -610,32 +632,32 @@ msgstr "Ver" #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:38 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:39 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:88 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:84 msgid "Limiting" msgstr "Limitante" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:61 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:60 msgid "Required materials" msgstr "Materiales requiridos" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:666 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:677 msgid "resources per day must be not empty and bigger than zero" msgstr "os recursos por día deben ser non baleiros e maiores que cero" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:341 msgid "Backwards" msgstr "Atrás" -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68 -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:78 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:67 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:77 msgid "Version" msgstr "Versión" -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51 +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:52 msgid "Apply filtering to resources satisfying required criteria" msgstr "Aplicar filtrado aos recursos que satisfán os criterios requeridos" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:104 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:106 msgid "Up" msgstr "Arriba" @@ -647,7 +669,7 @@ msgstr "" "CriterionType non válido, outro criterionSatisfaction solápase co mesmo " "criterionType" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:105 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:125 msgid "Types of work hours" msgstr "Tipos de horas de traballo" @@ -660,7 +682,7 @@ msgstr "EAC" msgid "Stacktrace:" msgstr "Stacktrace:" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:143 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:144 msgid "" "Its planning is not in the current scene.\n" "Should change to any of the following scenarios:\n" @@ -668,37 +690,19 @@ msgstr "" "A súa planificación non está no escenario actual.\n" "Debe cambiar a un dos seguintes:\n" -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:37 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:39 msgid "Predecessor" msgstr "Predecesor" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:189 -msgid "Some stretch has higher or equal values than the previous stretch" -msgstr "Algún tramo ten valores maiores ou iguais có tramo anterior" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:55 msgid "Please select a task" msgstr "Por favor, seleccione unha tarefa" -#: libreplan-webapp/src/main/webapp/costcategories/costCategory.zul:23 -msgid "LibrePlan: Cost Categories" -msgstr "LibrePlan: Categorías de custo" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:172 +msgid "Some stretch has higher or equal values than the previous stretch" +msgstr "Algún tramo ten valores maiores ou iguais có tramo anterior" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80 -#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:58 -#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:75 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:60 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:62 -msgid "End date" -msgstr "Data de fin" - -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:255 -msgid "missing worker code in the work report" -msgstr "falta código de traballador nun parte de traballo" - -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:142 +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:101 msgid "" "Value is not valid, the default max value must be greater than the precision " "value " @@ -706,56 +710,59 @@ msgstr "" "O valor non é válido, o valor máximo por defecto debe ser maior có valor de " "precisión " -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:146 -msgid "" -"You can not remove the company \"{0}\" because is already in use in some " -"project or in some subcontrated task." -msgstr "" -"Non pode eliminar a empresa \"{0}\" porque está sendo utilizada nalgún " -"proxecto ou nalgunha tarefa subcontrada." +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:245 +msgid "missing worker code in the work report" +msgstr "falta código de traballador nun parte de traballo" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:88 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82 +#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:45 +#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:61 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:60 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:58 +msgid "End date" +msgstr "Data de fin" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:89 msgid "profile name is already being used by another profile" msgstr "o nome do perfil xa está a ser usado por outro perfil" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:63 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:68 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:76 msgid "E-mail" msgstr "Correo electrónico" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:209 -msgid "Prefix:" -msgstr "Prefixo:" - -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:107 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:106 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:112 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:110 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:112 msgid "This project has already been added." msgstr "Este proxecto xa fora engadido." -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:381 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:204 +msgid "Prefix:" +msgstr "Prefixo:" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:386 msgid "The task code cannot be null" msgstr "O código da tarefa non pode ser nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:580 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:593 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 msgid "Criteria" msgstr "Criterios" -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:134 msgid "Resource / Criteria" msgstr "Recurso / Criterios" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:26 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:27 msgid "User data" msgstr "Datos do usuario" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:97 -msgid "Error setting up creation form." -msgstr "Erro preparando o formulario de creación." - #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:44 msgid "Lines" msgstr "Liñas" @@ -764,12 +771,16 @@ msgstr "Liñas" msgid "Add new progress assignment" msgstr "Engadir nova asignación de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:193 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:32 +msgid "Set Filter Options" +msgstr "Establecer as opcións de filtrado" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:977 msgid "Error on showing warning message removing workReportType: " msgstr "" "Erro ao mostrar mensaxe de advertencia borrando tipo de parte de traballo: " -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:624 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:633 msgid "Edit Work Report" msgstr "Editar parte de traballo" @@ -781,36 +792,35 @@ msgstr "Lista de formularios de calidade" msgid "Project version is the same in source and destination scenarios" msgstr "A versión do proxecto é a mesma nos escenarios de orixe e destino" -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:30 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:31 msgid "Personal data" msgstr "Datos persoais" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:732 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:733 msgid "Calculated progress can not be removed" msgstr "O progreso calculado non se pode borrar" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:299 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:162 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:200 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:158 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:199 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:331 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:164 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:202 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:159 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:202 msgid "please, select a Criterion" msgstr "por favor, seleccione un criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/OrderAuthorizationModel.java:127 -msgid "Project does not exist" -msgstr "O proxecto non existe" +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:112 +msgid "Work reports" +msgstr "Partes de traballo" #: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/EntryPointsHandler.java:143 msgid "{0} annotation required on {1}" msgstr "{0} anotación obrigatoria en {1}" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:66 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "June" msgstr "Xuño" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1031 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1038 msgid "Modified" msgstr "Modificado" @@ -822,14 +832,14 @@ msgstr "Engadir criterio" msgid "You can not remove the current scenario" msgstr "Non se pode borrar o escenario actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:648 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:653 msgid "format prefix invalid. It cannot be empty or contain whitespaces." msgstr "" "formato de prefixo inválido. Non pode estar baleiro ou conter espazos en " "branco." #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:89 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:334 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:338 msgid "MessagesContainer is needed" msgstr "É necesario un MessagesContainer" @@ -841,10 +851,14 @@ msgstr "Código da tarefa" #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:69 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:56 msgid "Ending date" msgstr "Data de fin" +#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:21 +msgid "LibrePlan: Page not found" +msgstr "LibrePlan: Páxina non atopada" + #: libreplan-webapp/src/main/webapp/templates/_list.zul:21 msgid "Templates List" msgstr "Lista de modelos" @@ -853,7 +867,7 @@ msgstr "Lista de modelos" msgid "Export options" msgstr "Opcións de exportación" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:229 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:227 msgid "Last value" msgstr "Último valor" @@ -861,7 +875,11 @@ msgstr "Último valor" msgid "Subcontracted Tasks List" msgstr "Lista de tarefas subcontratadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:705 +#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:51 +msgid "Average of worked hours in finished applications" +msgstr "Media de horas traballadas nas aplicacións finalizadas" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:706 msgid "Calculated progress can not be modified" msgstr "O progreso calculado non se pode modificar" @@ -869,40 +887,43 @@ msgstr "O progreso calculado non se pode modificar" msgid "Statistics log" msgstr "Histórico de estadísticas" -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:51 #: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:40 #: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:47 msgid "Edit Calendar" msgstr "Editar calendario" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:112 +msgid "Profile" +msgstr "Perfil" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:37 msgid "Materials Needs At Date" msgstr "Necesidades de materiais en data" #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:35 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:41 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:52 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:59 msgid "Cannot be empty or null" msgstr "Non pode ser baleiro ou nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:275 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:300 msgid "filtering" msgstr "filtrado" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:233 +msgid "{0} \"{1}\" saved" +msgstr "{0} \"{1}\" gardado" + #: libreplan-webapp/src/main/webapp/orders/_list.zul:33 msgid "Total Budget" msgstr "Presuposto total" -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:53 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:55 msgid "Hierarchy" msgstr "Xerarquía" -#: libreplan-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:23 -msgid "LibrePlan: Work Hours" -msgstr "LibrePlan: Horas de traballo" - -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:830 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:833 msgid "" "This worker cannot be deleted because it has assignments to projects or " "imputed hours" @@ -919,19 +940,23 @@ msgstr "Imprimir configuración" msgid "Overload due to other assignments" msgstr "Sobrecarga debido a outras asignacións" +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:117 +msgid "Types of hours" +msgstr "Tipos de horas" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:149 msgid "Time period saved" msgstr "Período de tiempo gardado" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:305 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:168 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:206 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:164 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:205 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:337 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:170 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:208 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:165 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:208 msgid "This Criterion has already been added." msgstr "Este criterio xa fora engadido." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:250 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:252 msgid "" "Are you sure of changing the resource type? You will lose the criteria with " "different resource type." @@ -939,7 +964,7 @@ msgstr "" "¿Está seguro de cambiar o tipo de recurso? Os criterios con diferente tipo " "de recurso perderanse." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:215 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:209 msgid "add" msgstr "engadir" @@ -948,7 +973,7 @@ msgid "Unsaved changes will be lost. Would you like to continue?" msgstr "Perderánse os cambios sen gardar. Gustaríalle continuar?" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:41 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:35 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:34 msgid "Filter work report by :" msgstr "Filtrar parte de traballo por :" @@ -956,7 +981,7 @@ msgstr "Filtrar parte de traballo por :" msgid "NON_LIMITING" msgstr "NON_LIMITANTE" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:290 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:291 msgid "Workers" msgstr "Traballadores" @@ -965,8 +990,7 @@ msgid "Cannot remove {0}, since it is being used by some Exception Day" msgstr "" "Non se pode borrar {0} porque está a ser usado por algún día de excepción" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:68 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45 msgid "August" msgstr "Agosto" @@ -974,11 +998,23 @@ msgstr "Agosto" msgid "Resources matching selected criteria" msgstr "Recursos que cumpren os criterios seleccionados" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:52 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:27 +msgid "with" +msgstr "con" + +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:297 +msgid "Label Type" +msgstr "Tipo de etiqueta" + +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:48 msgid "Year" msgstr "Ano" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:67 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:327 +msgid "{0} \"{1}\" could not be deleted, it was already removed" +msgstr "{0} \"{1}\" non puido ser borrado, xa fora eliminado" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:68 msgid "profile name not specified" msgstr "nome do perfil non especificado" @@ -986,50 +1022,42 @@ msgstr "nome do perfil non especificado" msgid "Date Start" msgstr "Data de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1281 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1275 msgid "Value is not valid, the current value must be less than max value" msgstr "O valor non é válido, o valor actual debe ser menor que o valor máximo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:55 -msgid "From Chosen" -msgstr "A partir de elixidos" - #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 -#: libreplan-webapp/src/main/webapp/planner/order.zul:109 +#: libreplan-webapp/src/main/webapp/planner/order.zul:108 msgid "Value" msgstr "Valor" -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:64 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:66 msgid "Hour costs" msgstr "Custos por hora" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:718 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:773 msgid "there are no valid periods for this calendar" msgstr "non hai períodos válidos para este calendario" -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:52 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:76 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:54 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:93 msgid "Add role" msgstr "Engadir rol" -#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:41 -msgid "Edit Scenario" -msgstr "Editar escenario" - -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:642 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1112 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:634 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1271 msgid "Exception end date should be greater or equals than start date" msgstr "" "A data de fin dunha excepción debe ser maior ou igual cá data de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:601 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:611 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:443 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:453 msgid "Repeated Project code {0} in Project {1}" msgstr "Código {0} de proxecto repetedio no proxecto {1}" -#: libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java:274 +#: libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java:277 msgid "Project from client" msgstr "Proxecto do cliente" @@ -1045,7 +1073,7 @@ msgstr "" "O {0} non se pode asignar a este recurso. O seu intervalo solápase con outro " "criterio" -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:66 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:62 msgid "Work done until ending date:" msgstr "Traballo realizado ata a data de fin:" @@ -1053,31 +1081,28 @@ msgstr "Traballo realizado ata a data de fin:" msgid "Schedule Performance Index" msgstr "Índice de rendemento da planificación" -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:138 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:135 msgid "Earlier starting date" msgstr "Data de inicio máis cedo" -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:26 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:27 msgid "Type data" msgstr "Datos do tipo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:313 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:117 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:314 msgid "Profiles" msgstr "Perfís" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:800 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:810 msgid "Hour finish" msgstr "Hora de fin" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:173 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:165 msgid "Perspectives" msgstr "Perspectivas" -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:40 -msgid "Edit Work Report Type" -msgstr "Editar tipo de parte de traballo" - -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:104 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:107 msgid "Workable time" msgstr "Tempo traballable" @@ -1085,20 +1110,11 @@ msgstr "Tempo traballable" msgid "missing code in a subcategory" msgstr "falta código nunha subcategoría" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:544 -msgid "Confirm deleting this cost category. Are you sure?" -msgstr "Confirmar o borrado desta categoría de custo. ¿Está seguro?" - #: libreplan-webapp/src/main/webapp/planner/editTask.zul:66 msgid "Non limiting resource allocation" msgstr "Asignación de recursos non limitantes" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:191 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:297 -msgid "Error removing element: " -msgstr "Erro ao borrar elemento: " - -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:39 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:40 msgid "Company name" msgstr "Nome da empresa" @@ -1111,16 +1127,15 @@ msgid "Split new assignment" msgstr "Dividir nova asignación" #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:67 -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:53 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:57 msgid "Pagination" msgstr "Paxinación" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:265 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:286 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:263 msgid "Expiry date" msgstr "Data de vencemento" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:337 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:342 msgid "" "The operation does not perform because the task has progress reports that is " "spread associated with this quality form" @@ -1137,16 +1152,16 @@ msgstr "Cambiar escenario" msgid "Critical path" msgstr "Camiño crítico" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:260 msgid "" "Deleting this item, it will disable the report progress option. Are you sure?" msgstr "" "Borrando este elemento, isto deshabilitará a opción de notificar progreso. " "¿Está seguro?" -#: libreplan-webapp/src/main/webapp/materials/materials.zul:38 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:42 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:83 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:41 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:41 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:80 msgid "Categories" msgstr "Categorías" @@ -1155,23 +1170,19 @@ msgstr "Categorías" msgid "Status code:" msgstr "Código de estado:" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:181 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:180 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:46 msgid "Project Details" msgstr "Detalles do proxecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:94 -msgid "Create Criterion Type" -msgstr "Crear tipo de criterio" - -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:107 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:206 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:225 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:89 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:221 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:159 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:181 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:189 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:162 msgid " to go to output directly" msgstr " ir á saída directamente" @@ -1179,16 +1190,20 @@ msgstr " ir á saída directamente" msgid "Add new hours group" msgstr "Engadir novo grupo de horas" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:219 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:221 msgid "Criteria: {0} " msgstr "Criterios: {0} " -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:385 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85 -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:63 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:44 +msgid "Cancel changes and back to scheduling" +msgstr "Cancelar cambios e volver á planificación" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:386 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87 +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:65 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68 -#: libreplan-webapp/src/main/webapp/planner/order.zul:110 +#: libreplan-webapp/src/main/webapp/planner/order.zul:109 msgid "Percentage" msgstr "Porcentaxe" @@ -1196,7 +1211,7 @@ msgstr "Porcentaxe" msgid "Updated" msgstr "Actualizado" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:71 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:81 msgid "Company logo URL" msgstr "URL do logo da empresa" @@ -1204,11 +1219,11 @@ msgstr "URL do logo da empresa" msgid "No worker selected" msgstr "Ningún traballador seleccionado" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:227 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:225 msgid "Number of digits" msgstr "Número de díxitos" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1651 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1639 msgid "Task not found" msgstr "Tarefa non atopada" @@ -1217,24 +1232,16 @@ msgstr "Tarefa non atopada" msgid "Total capability" msgstr "Capacidade total" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:732 -msgid "It not could remove the task " -msgstr "Non se puido borrar a tarefa " +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 +msgid "Is a libreplan user" +msgstr "É un usuario de libreplan" #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesModel.java:217 msgid "Problems connecting with client web service" msgstr "Problemas conectando co servizo web cliente" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:21 -msgid "LibrePlan: User access" -msgstr "LibrePlan: Acceso de usuarios" - -#: libreplan-webapp/src/main/webapp/materials/materials.zul:21 -msgid "LibrePlan: Materials" -msgstr "LibrePlan: Materiais" - -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:154 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:183 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:157 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:186 msgid "Exception Type" msgstr "Tipo de excepción" @@ -1242,11 +1249,11 @@ msgstr "Tipo de excepción" msgid "Profiles List" msgstr "Listado de perfís" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:567 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:944 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:580 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:689 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:236 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:869 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:919 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:51 #: libreplan-webapp/src/main/webapp/templates/templates.zul:64 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 @@ -1258,7 +1265,7 @@ msgstr "Etiquetas" msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "{0} da categoría {1} e {2} da categoría {3} teñen o mesmo código" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319 msgid "Data Types" msgstr "Tipos de datos" @@ -1267,25 +1274,25 @@ msgstr "Tipos de datos" msgid "Total hours" msgstr "Total de horas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:342 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:38 +msgid "Data" +msgstr "Datos" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:343 msgid "Reassigning {0} projects" msgstr "Reasignando {0} proxectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:84 -msgid "Create Work Hours Type" -msgstr "Crear novo tipo de horas de traballo" - -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:59 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:55 msgid "Filter by task status" msgstr "Filtrar por estado da tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:528 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:430 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:498 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:420 msgid "Select date:" msgstr "Seleccione data:" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:635 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1105 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:627 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1264 msgid "You should select a end date for the exception" msgstr "Debe seleccionar unha data de fin para a excepción" @@ -1293,7 +1300,7 @@ msgstr "Debe seleccionar unha data de fin para a excepción" msgid "Please try it again." msgstr "Por favor, volva a intentalo." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:49 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:56 msgid "Company code" msgstr "Código da empresa" @@ -1301,57 +1308,54 @@ msgstr "Código da empresa" msgid "Unknown attribute '{0}' in class {1}" msgstr "Atributo descoñecido '{0}' na clase {1}" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:714 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:717 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:33 msgid "NON LIMITING RESOURCE" msgstr "RECURSO NON LIMITANTE" -#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:22 -msgid "LibrePlan: Workers" -msgstr "LibrePlan: Traballadores" - -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:117 -msgid "Activation periods" -msgstr "Períodos de activación" - -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:389 -msgid "Passed" -msgstr "Pasado" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:90 +msgid "passwords can not be empty" +msgstr "os contrasinais non poden estar baleiros" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:88 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:128 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:175 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:176 msgid "already assigned" msgstr "xa asignado" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:34 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:68 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:390 +msgid "Passed" +msgstr "Pasado" + +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:120 +msgid "Activation periods" +msgstr "Períodos de activación" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:509 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:74 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:131 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:119 -#: libreplan-webapp/src/main/webapp/planner/order.zul:155 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:139 +#: libreplan-webapp/src/main/webapp/planner/order.zul:154 msgid "Calendar" msgstr "Calendario" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:301 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:119 +msgid "Resources" +msgstr "Recursos" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:56 msgid "Read" msgstr "Leer" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:99 -msgid "Resources" -msgstr "Recursos" - #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java:153 msgid "Source and destination scenarios should be different" msgstr "Os escenarios de orixe e destino deben ser diferentes" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:230 -msgid "CriterionType and its criteria saved" -msgstr "Tipo de criterio e os seus criterios gardados" - -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:137 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:141 msgid "The browser you are using" msgstr "O navegador que está usando" @@ -1360,23 +1364,18 @@ msgid "scenario" msgstr "escenario" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:51 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:50 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:248 -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:41 -#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:30 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:49 +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:42 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:42 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:29 msgid "to" msgstr "a" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:197 -msgid "Error on removing typeOfWorkHours: " -msgstr "Erro borrando tipo de horas de traballo : " - -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:112 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:115 msgid "worker's first name not specified" msgstr "nome do traballador non especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:276 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:281 msgid "date not specified" msgstr "data non especificada" @@ -1384,9 +1383,9 @@ msgstr "data non especificada" msgid "Select type :" msgstr "Seleccione tipo :" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:263 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:259 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:269 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:264 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:196 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:206 msgid "Projects Planning" msgstr "Planificación de proxectos" @@ -1394,12 +1393,18 @@ msgstr "Planificación de proxectos" msgid "Shrink to fit page width" msgstr "Reducir para axustar ao ancho de páxina" -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:67 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:773 +msgid "The max value must be greater than 0" +msgstr "O valor máximo debe ser maior que 0" + +#: libreplan-webapp/src/main/webapp/settings/settings.zul:63 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:70 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:55 msgid "Last name" msgstr "Apelidos" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:348 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:551 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:380 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:556 msgid "Remove" msgstr "Borrar" @@ -1407,15 +1412,15 @@ msgstr "Borrar" msgid "cost category name not specified" msgstr "nome da categoría de custo non especificado" -#: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:22 -msgid "LibrePlan: Virtual Workers Groups" -msgstr "LibrePlan: Grupos de traballadores virtuais" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:131 msgid "SPI" msgstr "SPI" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1334 +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:232 +msgid "Progress Type" +msgstr "Tipo de progreso" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1295 msgid "Task contains consolidated progress. Cannot apply sigmoid function." msgstr "" "A tarefa contén progreso consolidado. Non se pode aplicar a función sigmoide." @@ -1429,19 +1434,23 @@ msgstr "" "A data de inicio non é válida, a data de inicio nova debe ser anterior data " "de inicio actual" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:516 +msgid "This date can not include the whole previous work week" +msgstr "Esta data non pode incluír á semana de traballo anterior completa" + #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:390 msgid "the code must be not null or not empty" msgstr "o código non pode ser nulo ou baleiro" -#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:35 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:119 msgid "Create New Project" msgstr "Crear proxecto novo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1420 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1430 msgid "Stretches list" msgstr "Lista de tramos" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:187 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:180 msgid "Enable scenarios module" msgstr "Habilitar módulo de escenarios" @@ -1449,52 +1458,50 @@ msgstr "Habilitar módulo de escenarios" msgid "Zoom" msgstr "Zoom" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:608 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:41 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:211 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:829 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:205 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:185 -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:46 -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:52 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:95 +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:78 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:124 +#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:44 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:97 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:48 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:88 -#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:45 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:90 +#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:44 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:45 #: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:40 #: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:41 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:106 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:117 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:115 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:39 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:130 -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38 -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:41 -#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:38 -#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:42 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:81 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:92 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:80 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:135 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:130 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:241 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:132 +#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:64 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:76 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:81 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:151 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:135 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:376 msgid "Save" msgstr "Gardar" -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:62 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:33 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:72 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34 msgid "Standard Effort" msgstr "Esforzo estándar" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:109 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:129 msgid "Material categories" msgstr "Categorías de materiais" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:240 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:570 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:669 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:273 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:576 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:674 msgid "number of digits must be between {0} and {1}" msgstr "o número de díxitos debe estar entre {0} e {1}" @@ -1506,7 +1513,7 @@ msgstr "Criterios requiridos" msgid "Pending update" msgstr "Actualización pendente" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:59 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55 msgid "End date:" msgstr "Data de fin:" @@ -1522,23 +1529,47 @@ msgstr "Autorización de usuarios" msgid "Problems connecting with subcontractor web service" msgstr "Problemas conectando co servizo web subcontratista" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:219 +msgid "Entity type" +msgstr "Tipo de entidade" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:263 +msgid "Unsaved changes will be lost. Are you sure?" +msgstr "Perderánse os cambios sen gardar. Está seguro?" + +#: libreplan-webapp/src/main/webapp/templates/templates.zul:22 +#: libreplan-webapp/src/main/webapp/planner/order.zul:22 +#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:22 +#: libreplan-webapp/src/main/webapp/planner/index.zul:22 +#: libreplan-webapp/src/main/webapp/planner/resources_use.zul:22 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:22 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22 +#: libreplan-webapp/src/main/webapp/planner/main.zul:22 +#: libreplan-webapp/src/main/webapp/resourceload/resourceload.zul:22 +msgid "LibrePlan: Scheduling" +msgstr "LibrePlan: planificación" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:277 +msgid "UserDn:" +msgstr "UserDn:" + #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:44 msgid "Assigned load" msgstr "Carga asignada" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:139 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:142 msgid "End Date" msgstr "Data de fin" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:68 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:64 msgid "Filter by workers" msgstr "Filtrar por traballadores" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:374 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73 msgid "Some allocations needed" msgstr "Precísanse algunas asignacións" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:83 msgid "Resources Per Day" msgstr "Recursos por día" @@ -1554,7 +1585,7 @@ msgstr "" "Data de fin estimada para a tarefa (presione enter no cadro de texto para " "abrir o calendario ou escriba a data directamente)" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:281 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:292 msgid "Expand/Collapse all" msgstr "Expandir/Pregar todo" @@ -1562,34 +1593,33 @@ msgstr "Expandir/Pregar todo" msgid "Overload due to current project" msgstr "Sobrecarga debido ao proxecto actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:857 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:907 msgid "Name: {0}" msgstr "Nome: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:867 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:874 msgid "Move down" msgstr "Mover abaixo" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:116 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:112 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:137 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:118 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:113 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:139 msgid "Please, select a project" msgstr "Por favor, seleccione un proxecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:69 +#: libreplan-webapp/src/main/webapp/calendars/_list.zul:29 +msgid "Inherits from date" +msgstr "Herda da data" + +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45 msgid "September" msgstr "Setembro" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:27 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:28 msgid "Report structure" msgstr "Estrutura do parte" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:88 -msgid "password not specified" -msgstr "contrasinal non especificado" - -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:118 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:119 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:42 #: libreplan-webapp/src/main/webapp/templates/templates.zul:59 msgid "General data" @@ -1599,11 +1629,12 @@ msgstr "Datos xerais" msgid "BAC" msgstr "BAC" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:399 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:379 msgid "Calculate Number of Hours" msgstr "Calcular número de horas" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:105 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38 msgid "Assign" @@ -1613,34 +1644,24 @@ msgstr "Asignar" msgid "missing code in a criterion" msgstr "falta código nun criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1296 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1273 msgid "Create Template" msgstr "Crear modelo" -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:23 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:23 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:23 -msgid "LibrePlan: Work Reports" -msgstr "LibrePlan: Partes de traballo" - -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:115 -msgid "Edit Company" -msgstr "Editar empresa" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:60 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:67 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:68 msgid "Advanced search" msgstr "Búsqueda avanzada" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:99 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:116 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:78 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:78 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:86 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:95 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:112 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:74 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:74 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:82 msgid "Filter by labels" msgstr "Filtrar por etiquetas" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:574 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:577 msgid "" "IMPORTANT: Don't forget to communicate to subcontractor that his contract " "has been cancelled" @@ -1648,30 +1669,32 @@ msgstr "" "IMPORTANTE: Non olvide comunicar ao subcontratista que o seu contrato foi " "cancelado" -#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:38 +#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:36 msgid "MonteCarlo chart" msgstr "Diagrama de Montecarlo" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:21 -msgid "LibrePlan: Hours Worked Per Resource" -msgstr "LibrePlan: Horas traballadas por recurso" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:126 msgid "Schedule Variance" msgstr "Desviación en planificación" +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:496 +msgid "Error on showing warning message removing qualityForm: " +msgstr "" +"Erro ao mostrar mensaxe de advertencia borrando un formulario de calidade: " + #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:410 msgid "Service does not manage resource of type: {0}" msgstr "O servizo non xestiona recursos de tipo: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:191 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:442 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:185 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:210 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:506 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:544 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:575 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1365 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:974 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:474 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:492 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:103 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:148 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:509 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:547 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:578 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73 msgid "Warning" msgstr "Advertencia" @@ -1680,15 +1703,13 @@ msgstr "Advertencia" msgid "Select parent calendar" msgstr "Seleccionar o calendario pai" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:96 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:168 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:463 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:526 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:450 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:513 msgid "There is no task with this code" msgstr "Non hai ningunha tarefa con este código" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:433 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:214 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:441 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:146 msgid "The type of hours cannot be null" msgstr "O tipo de horas no pode ser nulo" @@ -1697,14 +1718,14 @@ msgid "criterion satisfaction with end date less than start date" msgstr "o criterio satisfeito ten data de fin anterior á de inicio" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:112 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:230 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:190 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:167 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:189 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:197 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:170 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:94 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:214 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:226 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166 msgid "Show" msgstr "Mostrar" @@ -1716,18 +1737,6 @@ msgstr "Duración (días)" msgid "Assignment Type" msgstr "Tipo de asignación" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:22 -#: libreplan-webapp/src/main/webapp/planner/order.zul:22 -#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:22 -#: libreplan-webapp/src/main/webapp/planner/index.zul:22 -#: libreplan-webapp/src/main/webapp/planner/resources_use.zul:22 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:22 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22 -#: libreplan-webapp/src/main/webapp/planner/main.zul:22 -#: libreplan-webapp/src/main/webapp/resourceload/resourceload.zul:22 -msgid "LibrePlan: Scheduling" -msgstr "LibrePlan: planificación" - #: libreplan-webapp/src/main/webapp/common/layout/timeout.zul:29 msgid "Back to log in" msgstr "Volver a iniciar sesión" @@ -1741,31 +1750,28 @@ msgstr "Erro ao dividir" msgid "Planned start :" msgstr "Inicio planificado :" -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47 -msgid "Company" -msgstr "Empresa" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:66 msgid "Node without children" msgstr "Nodo sen fillos" +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:152 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47 +msgid "Company" +msgstr "Empresa" + #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:118 msgid "There is no label with this code " msgstr "Non hai ningunha etiqueta con este código" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:210 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:212 msgid "Task: {0} " msgstr "Tarefa: {0} " -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:138 -msgid "Profile saved" -msgstr "Perfil gardado" - #: libreplan-webapp/src/main/webapp/planner/editTask.zul:65 msgid "Task properties" msgstr "Propiedades da tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:75 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:84 msgid "There is no type of work report with this code" msgstr "Non hai ningún tipo de parte de traballo con este código" @@ -1778,10 +1784,6 @@ msgstr "Suma de horas imputadas directamente" msgid "Surname" msgstr "Apelidos" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1364 -msgid "You need to select some function to configure" -msgstr "Necesita seleccionar algunha función para configurar" - #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:22 msgid "Exception Day Types List" msgstr "Lista de tipos de día de excepción" @@ -1790,70 +1792,61 @@ msgstr "Lista de tipos de día de excepción" msgid "the name must be not null or not empty" msgstr "o nome non pode ser nulo ou baleiro" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:741 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:393 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:157 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:750 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:394 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:154 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:68 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:131 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:67 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:69 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:77 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:87 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 -#: libreplan-webapp/src/main/webapp/planner/order.zul:111 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:49 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45 +#: libreplan-webapp/src/main/webapp/planner/order.zul:110 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:48 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 msgid "Date" msgstr "Data" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:363 -msgid "there must be {0} effort instead of {1}" -msgstr "debe haber {0} esforzo en lugar de {1}" - #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:42 msgid "Add From Template" msgstr "Engadir a partir de modelo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:505 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:543 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:508 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:546 msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "Os recursos asignados para esta tarefa serán borrados. Está seguro?" -#: libreplan-webapp/src/main/webapp/excetiondays/exceptionDays.zul:22 -msgid "LibrePlan: Exception Days" -msgstr "LibrePlan: Días de excepción" - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:646 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:651 msgid "" "format prefix invalid. It cannot be empty or contain '_' or whitespaces." msgstr "" "formato de prefixo inválido. Non pode estar baliero ou conter '_' ou espazos " "en branco." -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:45 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:41 msgid "Filter by month" msgstr "Filtrar por mes" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:351 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:361 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:320 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:322 msgid "The criterion and its type cannot be null" msgstr "O criterio e o seu tipo non poden ser nulos" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:526 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:421 msgid "The quality form must have an item with 100% value to report progress" msgstr "" "O formulario de calidaed debe ter un ítem con valor 100% para notificar " "progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:67 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "July" msgstr "Xullo" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:220 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:156 msgid "The code is not valid. There is another unit type with the same code" msgstr "O código non é válido. Hai outro tipo de unidade co mesmo código" @@ -1861,16 +1854,15 @@ msgstr "O código non é válido. Hai outro tipo de unidade co mesmo código" msgid "( max: {0} )" msgstr "( máx: {0} )" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:218 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:222 msgid "Error on removing element: " msgstr "Erro ao borrar elemento: " -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:61 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 msgid "January" msgstr "Xaneiro" -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:64 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:60 msgid "Cannot calculate charts for current data" msgstr "Non se poden calcular gráficos para os datos actuais" @@ -1878,9 +1870,9 @@ msgstr "Non se poden calcular gráficos para os datos actuais" msgid "Select queue" msgstr "Seleccionar cola" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:582 -msgid "The cost category had already been removed." -msgstr "A categoría de custo xa fora borrada." +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:173 +msgid "project name already being used" +msgstr "o nome de proxecto xa está sendo usado" #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:48 msgid "Work description" @@ -1899,43 +1891,41 @@ msgstr "Non hai ningún progreso asignado á tarefa actual" msgid "You can not remove the default scenario called \"{0}\"" msgstr "Non se pode borrar o escenario por defecto, chamado \"{0}\"" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:106 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:205 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:224 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:185 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:162 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:184 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:192 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:165 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:88 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:209 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:220 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:158 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:180 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:188 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:161 msgid "direct link" msgstr "enlace directo" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:110 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:112 msgid "Down" msgstr "Abaixo" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:934 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:842 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementFilterEnum.java:36 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:48 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:89 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:109 msgid "Label" msgstr "Etiqueta" -#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:37 -msgid "Create Scenario" -msgstr "Crear Escenario" - -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:834 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:841 msgid "Value is not valid, taking into account the current list of HoursGroup" msgstr "O valor non é válido, tendo en conta a lista actual de HoursGroup" -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:48 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:72 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:51 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:90 msgid "Association with roles" msgstr "Asociación con roles" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:384 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:371 msgid "missing type of work hours in a work report line" msgstr "falta tipo de horas de traballo nunha liña do parte" @@ -1943,8 +1933,8 @@ msgstr "falta tipo de horas de traballo nunha liña do parte" msgid "Quality forms" msgstr "Formularios de calidade" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:624 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:634 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:466 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:476 msgid "Repeated Hours Group code {0} in Project {1}" msgstr "Código {0} de groupo de horas repetido no proxecto {1}" @@ -1952,6 +1942,10 @@ msgstr "Código {0} de groupo de horas repetido no proxecto {1}" msgid "Hours group" msgstr "Grupo de horas" +#: libreplan-webapp/src/main/webapp/users/users.zul:23 +msgid "LibrePlan: Accounts" +msgstr "LibrePlan: Contas" + #: libreplan-webapp/src/main/webapp/templates/templates.zul:96 #: libreplan-webapp/src/main/webapp/templates/_list.zul:30 msgid "Days from Beginning to Deadline" @@ -1961,43 +1955,37 @@ msgstr "Días desde o comezo ata a data límite" msgid "Estimate At Completion" msgstr "Estimación de custo total actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:200 -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:421 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:373 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:194 -msgid "Delete item. Are you sure?" -msgstr "Borrar elemento. ¿Está seguro?" - #: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/ResourcesCostCategoryAssignment.java:102 msgid "cost assignment's start date not specified" msgstr "data de inicio da asignación de custo non especificada" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:92 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:193 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:208 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:171 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:170 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:178 +#: 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/workingProgressPerTaskReport.zul:166 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:174 msgid "Output format:" msgstr "Formato de saída:" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1029 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1192 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:45 msgid "Direct" msgstr "Directo" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:818 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:189 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:268 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:289 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:828 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:104 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:193 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:245 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:266 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:34 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:52 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:83 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:51 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:86 msgid "Op." msgstr "Op." -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:55 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:51 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:51 msgid "Reference date:" msgstr "Data de referencia:" @@ -2005,11 +1993,11 @@ msgstr "Data de referencia:" msgid "Pessimistic" msgstr "Pesimista" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:373 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:376 msgid "Limiting resource assignation" msgstr "Asignación de recursos limitantes" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1235 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238 msgid "" "This progress can not be removed, because it is spread. It is necessary to " "select another progress as spread." @@ -2017,7 +2005,7 @@ msgstr "" "Este progreso non se pode eliminar porque é propagado. Cómpre seleccionar " "outro progreso como propagado" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:116 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:119 msgid "Work week" msgstr "Semana de traballo" @@ -2026,15 +2014,15 @@ msgid "You will lose the changes. Are you sure?" msgstr "Perderanse os cambios. ¿Está seguro?" #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:28 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:45 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:47 msgid "Company ID" msgstr "NIF" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:192 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:129 msgid "Unit type name cannot be empty" msgstr "O nome do tipo de unidade non pode ser baleiro" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:38 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:42 msgid "Entity sequences" msgstr "Secuencias de entidade" @@ -2043,15 +2031,19 @@ msgstr "Secuencias de entidade" msgid "Delay from beginning (days)" msgstr "Retraso desde o comezo (en días)" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:319 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:324 msgid "Resource cannot be null" msgstr "O recurso non pode ser nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:505 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:453 msgid "Total Hours" msgstr "Horas totais" -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:366 +msgid "LibrePlan Role" +msgstr "Rol LibrePlan" + +#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:36 msgid "Create Progress Type" msgstr "Crear novo tipo de progreso" @@ -2059,12 +2051,8 @@ msgstr "Crear novo tipo de progreso" msgid "Confirm cancel" msgstr "Confirmar cancelación" -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:62 -msgid "Label list" -msgstr "Lista de etiquetas" - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:335 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:37 msgid "Work And Progress Per Task" msgstr "Traballo e progreso por tarefa" @@ -2072,70 +2060,69 @@ msgstr "Traballo e progreso por tarefa" msgid "WBS (tasks)" msgstr "EDT (tarefas)" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1250 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:423 -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:133 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:299 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:538 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:552 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1234 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:455 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:300 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:465 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:150 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:227 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:310 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:859 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:894 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:262 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:207 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:835 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:870 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:264 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:208 msgid "Error on showing removing element: " msgstr "Erro ao mostrar o elemento a borrar: " -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:698 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:701 msgid "Deleting sequence" msgstr "Borrando secuencia" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:87 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:88 msgid "Select scenario" msgstr "Seleccionar escenario" -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:218 -msgid "Create Label Type" -msgstr "Crear tipo de etiqueta" +#: libreplan-webapp/src/main/webapp/settings/settings.zul:51 +msgid "Login" +msgstr "Nome de usuario" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:233 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:225 msgid "missing work report code in a work report" msgstr "falta o código nun parte de traballo" -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36 -msgid "Create Work Report Type" -msgstr "Crear tipo de parte de traballo" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:299 +msgid "Edit Virtual Workers Group: {0}" +msgstr "Editar grupo de traballadores virtuais: {0}" #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51 msgid "Criterion requirement" msgstr "Criterios requiridos" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1245 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1404 msgid "Only the last activation period allows to delete end date." msgstr "Só o último periodo de activación permite borrar a data de fin." -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:329 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:189 +#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:63 +msgid "Maximum/minimum of worked hours in finished applications" +msgstr "Máximo/mínimo das horas traballadas nas aplicacións finalizadas" + +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 msgid "Scheduling saved" msgstr "Planificación gardada" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:197 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:192 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:171 -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:27 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:68 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:28 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:70 msgid "Add new row" msgstr "Engadir nova fila" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:782 -msgid "incorrect initialization of the progress assignment controller." -msgstr "inicialización incorrecta do controlador de asignación de progreso." - -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:488 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:492 msgid "Move" msgstr "Mover" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:67 +msgid "Password saved" +msgstr "Contrasinal gardado" + #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:224 msgid "missing code in the resource calendar" msgstr "falta código no calendario de recursos" @@ -2154,7 +2141,7 @@ msgstr "Histórico de asignacións" msgid "CutycaptTimeout thread exception" msgstr "Excepción no thread CutycaptTimeout" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:22 msgid "Work Report Models" msgstr "Modelos de partes de traballo" @@ -2167,11 +2154,15 @@ msgstr "Data da última medida de progreso" msgid "Deadline (days since beggining project)" msgstr "Data límite (días desde o inicio do proxecto)" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:422 -msgid "number of hours is not properly calculated based on clock" -msgstr "número de horas non calculado correctamente basado en reloxo" +#: libreplan-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:23 +msgid "LibrePlan: Companies" +msgstr "LibrePlan: Empresas" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:385 +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:22 +msgid "LibrePlan: Progress Report" +msgstr "LibrePlan: Informe de progreso" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:417 msgid "" "Calendar cannot be removed because it still has children. Some other " "calendar is derived from this one." @@ -2179,15 +2170,15 @@ msgstr "" "O calendario non se pudo borrar porque aínda ten fillos. Algún outro " "calendario deriva deste." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:918 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:921 msgid "Value is not valid, the type must be not empty" msgstr "O valor non é válido, o tipo non pode estar baleiro" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:444 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:445 msgid "criterion type name is already being used" msgstr "o nome de tipo de criterio está sendo usado" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:331 msgid "Task code cannot be null" msgstr "O código da tarefa non pode ser nulo" @@ -2195,17 +2186,13 @@ msgstr "O código da tarefa non pode ser nulo" msgid "It is not allowed to consolidate progress." msgstr "Non se pode borrar progreso consolidado." -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:31 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32 msgid "Create Task" msgstr "Crear tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:98 -msgid "Error setting up creation form for Criterion Type" -msgstr "Erro preparando o formulario de creación para un tipo de criterio" - -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:151 -msgid "Edit Cost Category" -msgstr "Editar categoría de custo" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 +msgid "LDAP Authentication enabled" +msgstr "Autenticación co LDAP activada" #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27 msgid "External company" @@ -2215,44 +2202,52 @@ msgstr "Empresa externa" #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:58 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:82 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:112 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:60 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:99 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:129 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:27 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68 msgid "Actions" msgstr "Accións" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:115 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:118 msgid "Exceptions" msgstr "Excepcións" +#: libreplan-webapp/src/main/webapp/settings/settings.zul:32 +msgid "User settings" +msgstr "Preferencias de usuario" + #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:80 msgid "Start hour" msgstr "Hora de inicio" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:139 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:140 msgid "Assign materials" msgstr "Asignar materiais" -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:33 msgid "Over assignable" msgstr "Sobreasignable" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:226 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:231 msgid "format filters are not valid" msgstr "o formato dos filtros non é válido" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:29 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:37 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:72 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:76 msgid "ID" msgstr "NIF" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:419 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 +msgid "Settings" +msgstr "Preferencias" + +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:346 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:181 msgid "The init date cannot be empty" msgstr "A data de inicio non pode ser baleira" @@ -2261,20 +2256,20 @@ msgstr "A data de inicio non pode ser baleira" msgid "Is administrator" msgstr "É administrador" -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:88 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:90 msgid "Our company password" msgstr "Contrasinal da nosa empresa" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:275 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:134 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:172 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:130 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:171 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:307 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:136 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:174 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:131 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:174 msgid "This label has already been added." msgstr "Esta etiqueta xa fora engadida." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java:79 -#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceServiceREST.java:179 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java:80 +#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceServiceREST.java:181 msgid "Could not get code, please try again later" msgstr "Non se puido obter o código, por favor volva intentalo máis tarde" @@ -2286,19 +2281,15 @@ msgstr "" "O valor non é válido.\n" " o código no pode conter caracteres como '_'." -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:625 -msgid "Confirm deleting this machine. Are you sure?" -msgstr "Confirmar o borrado desta máquina. ¿Está seguro?" - #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:161 msgid "Hours Group" msgstr "Grupo de horas" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:915 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:823 msgid "Unallocated name" msgstr "Nome no asignado" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:888 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:895 msgid "Move up" msgstr "Mover arriba" @@ -2311,10 +2302,10 @@ msgid "Subcontract communication date" msgstr "Data de comunicación da subcontratación" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:281 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:262 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:354 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:129 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:132 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:263 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:359 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:131 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:134 msgid "Scheduling" msgstr "Planificación" @@ -2322,7 +2313,13 @@ msgstr "Planificación" msgid "Dependencies have priority" msgstr "As dependencias teñen prioridade" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:206 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:516 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:901 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:126 +msgid "Create {0}" +msgstr "Crear {0}" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:218 msgid "Unlimited" msgstr "Ilimitado" @@ -2334,20 +2331,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/planner/company/CompanyPlanningModel.java:228 -msgid "Create new project" -msgstr "Crear novo proxecto" - -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:62 +#: 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/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:865 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:915 #: libreplan-webapp/src/main/webapp/orders/_list.zul:35 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:159 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 @@ -2359,38 +2357,30 @@ msgstr "Estado" msgid "Must start after" msgstr "Debe empezar despois" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1345 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1306 msgid "Confirm change" msgstr "Confirmar cambio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:864 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:840 msgid "You don't have permissions to edit this project" msgstr "Non ten permisos para editar este proxecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:104 -msgid "Edit Profile" -msgstr "Editar perfil" - #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:192 msgid "missing date in a calendar exception" msgstr "falta a data nunha excepción de calendario" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:432 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:213 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:440 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:145 msgid "" "Type of hours is empty. Please, create some type of hours before proceeding" msgstr "" "O tipo de horas está baleiro. Por favor, cree algún tipo de horas antes de " "proceder" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:598 -msgid "Exception" -msgstr "Excepción" - #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:108 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:180 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:450 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:515 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:172 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:437 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:502 msgid "There is no resource with this ID" msgstr "Non hai un recurso con este NIF" @@ -2399,15 +2389,19 @@ msgstr "Non hai un recurso con este NIF" msgid "Send" msgstr "Enviar" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:103 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:104 msgid "user" msgstr "usuario" +#: libreplan-webapp/src/main/webapp/materials/materials.zul:21 +msgid "LibrePlan: Materials" +msgstr "LibrePlan: Materiais" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeModel.java:53 msgid "New task" msgstr "Nova tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:132 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:192 msgid "The password for a new user cannot be empty" msgstr "O contrasinal non pode ser baleiro para un usuario novo" @@ -2419,23 +2413,19 @@ msgstr "Usuario asociado" msgid "Type name" msgstr "Nome do tipo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69 -msgid "Progress assignment" -msgstr "Asignacións de progreso" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:31 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:182 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:181 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:205 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:440 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:687 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:27 msgid "All" msgstr "Todo" -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:40 -msgid "Edit Progress Type" -msgstr "Editar tipo de progreso" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69 +msgid "Progress assignment" +msgstr "Asignacións de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:459 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:463 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:77 msgid "Manual" msgstr "Manual" @@ -2447,11 +2437,11 @@ msgstr "Lista de calendarios" msgid "Receipt date" msgstr "Data de recepción" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:210 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:209 msgid "Cannot be higher than Ending date" msgstr "Non pode ser posterior á data de fin" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:292 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:269 msgid "Create activation period" msgstr "Crear período de activación" @@ -2463,9 +2453,9 @@ msgstr "Lista de traballadores" msgid "Personal details" msgstr "Detalles persoais" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1027 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1190 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:48 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:214 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:217 msgid "Inherited" msgstr "Herdado" @@ -2473,12 +2463,8 @@ msgstr "Herdado" msgid "Delete project template. Are you sure?" msgstr "Borrar modelo de proxecto. ¿Está seguro?" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:255 -msgid "Worker" -msgstr "Traballador" - -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:517 -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:595 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:521 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:599 msgid "" "Cannot allocate selected element. There is not any queue that matches " "resource allocation criteria at any interval of time" @@ -2486,16 +2472,21 @@ msgstr "" "Non se pode asignar o elemento seleccionado. Non hai ningunha cola que " "coincida cos criterios de asignación de recursos en ningún intervalo de tempo" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:890 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:287 +msgid "Worker" +msgstr "Traballador" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java:217 msgid "Criterion must be not-null" msgstr "O criterio non debe ser nulo" #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:161 -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:299 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:300 msgid "criterion name not specified" msgstr "nome do criterio non especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:136 +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:95 msgid "Value is not valid, the default max value must not be empty " msgstr "" "O valor non é válido, o valor máximo por defecto non debe estar baleiro " @@ -2517,15 +2508,19 @@ msgstr "Autorizar" msgid "Recommended allocation" msgstr "Asignación recomendada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:303 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:241 +msgid "Activation" +msgstr "Activación" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304 msgid "Scenarios" msgstr "Escenarios" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:375 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:376 msgid "Materials saved" msgstr "Materiais gardados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1249 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1252 msgid "" "This progress measurement can not be in current date, because it is " "consolidated. it is necessary to select other date." @@ -2533,15 +2528,24 @@ msgstr "" "Esta medida de progreso non pode estar na data actual, porque está " "consolidada. Débese seleccionar outra data." -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:705 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:334 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:37 +msgid "Total Worked Hours By Resource In A Month" +msgstr "Total horas traballadas por recurso nun mes" + +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:672 msgid "Other projects" msgstr "Outros proxectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:159 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:111 +msgid "Tasks input buffer" +msgstr "Buffer de tarefas de entrada" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:168 msgid "At least one {0} sequence must be active" msgstr "Polo menos unha secuencia de {0} debe estar activa" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:111 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:26 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 @@ -2560,15 +2564,19 @@ msgstr "Deshabilitar borrado" msgid "You should select a source scenario" msgstr "Debe seleccionar un escenario de orixe" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:154 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:163 msgid "At least one {0} sequence is needed" msgstr "Necesítase polo menos unha secuencia de {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:37 msgid "Estimated/Planned Hours Per Task" msgstr "Horas estimadas/planificadas por tarefa" +#: libreplan-webapp/src/main/webapp/costcategories/costCategory.zul:23 +msgid "LibrePlan: Cost Categories" +msgstr "LibrePlan: Categorías de custo" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/TwoWaySelector.java:68 msgid "Assigned" msgstr "Asignado" @@ -2577,11 +2585,15 @@ msgstr "Asignado" msgid "Details" msgstr "Detalles" +#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:21 +msgid "LibrePlan: Units" +msgstr "LibrePlan: Unidades" + #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 msgid "Communication" msgstr "Comunicación" -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:35 +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:36 msgid "More options" msgstr "Máis opcións" @@ -2590,15 +2602,11 @@ msgstr "Máis opcións" msgid "Error: {0}" msgstr "Erro: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:185 -msgid "Company saved" -msgstr "Empresa gardada" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:240 msgid "Confirm create template" msgstr "Confirmar a creación do modelo" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:261 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:238 msgid "Parent" msgstr "Pai" @@ -2606,38 +2614,43 @@ msgstr "Pai" msgid "Earliest date" msgstr "Data máis cedo" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:126 -msgid "Type of work hours saved" -msgstr "Tipo de horas de traballo gardado" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 +msgid "Change Password" +msgstr "Cambiar o contrasinal" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:269 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:113 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:46 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21 +msgid "LibrePlan: Work And Progress Per Task" +msgstr "LibrePlan: Traballo e progreso por tarefa" + +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:48 msgid "Projects" msgstr "Proxectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:150 -msgid "Create Quality Form" -msgstr "Crear formulario de calidade" - #: libreplan-webapp/src/main/java/org/libreplan/web/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:264 +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" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:72 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:46 msgid "December" msgstr "Decembro" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:922 +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:35 +msgid "Change password" +msgstr "Cambiar o contrasinal" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:830 msgid "Text field" msgstr "Campo de texto" -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:122 +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:81 msgid "" "Value is not valid, the Precision value must be less than the defalt max " "value." @@ -2645,11 +2658,11 @@ msgstr "" "O valor non é válido, o valor de precisión debe ser menor que o valor máximo " "por defecto." -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:181 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:97 msgid "Question" msgstr "Pregunta" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1246 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1249 msgid "" "This progress measurement can not be changed or removed, because it is " "consolidated. It is needed to remove its consolidation." @@ -2657,17 +2670,18 @@ msgstr "" "Esta medida de progreso non pode ser cambiada ou borrada, porque está " "consolidada. Débese borrar a consolidación." -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:222 +#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:23 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:225 msgid "Create new work week" msgstr "Crear nova semana de traballo" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:134 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:137 msgid "The admin's account password remains the default one. This is unsecure" msgstr "" "O contrasinal da conta de admin segue sendo o contrasinal por defecto. Esto " "non é seguro" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:713 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:716 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:34 msgid "LIMITING RESOURCE" msgstr "RECURSO LIMITANTE" @@ -2676,7 +2690,7 @@ msgstr "RECURSO LIMITANTE" msgid "Subcontratation" msgstr "Subcontratación" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:198 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:135 msgid "" "The meausure name is not valid. There is another unit type with the same " "measure name" @@ -2684,24 +2698,20 @@ msgstr "" "O nome da medida non é válido. Hai outro tipo de unidade co mesmo nome de " "medida" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:535 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:590 msgid "{0} cannot be fulfilled" msgstr "Non se pode cumprir {0}" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:68 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:69 msgid "Extended view" msgstr "Vista expandida" -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:33 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:34 msgid "Work record" msgstr "Rexistro de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:116 -msgid "Error setting up edition form." -msgstr "Erro preparando o formulario de edición." - -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:149 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:151 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:145 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:147 msgid "Output format" msgstr "Formato de saída" @@ -2709,14 +2719,6 @@ msgstr "Formato de saída" msgid "Print" msgstr "Imprimir" -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:22 -msgid "LibrePlan: Calendars" -msgstr "LibrePlan: Calendarios" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:412 -msgid "Hours cannot be null" -msgstr "As horas non poden ser nulas" - #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java:179 msgid "{0} not found type for criterion " msgstr "{0} non atopado tipo para criterio " @@ -2725,56 +2727,53 @@ msgstr "{0} non atopado tipo para criterio " msgid "Page down" msgstr "Páxina abaixo" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:485 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:486 msgid "resource type does not allow enabled criteria" msgstr "o tipo de recurso non permite criterios habilitados" -#: libreplan-webapp/src/main/webapp/common/event_error.zul:22 -#: libreplan-webapp/src/main/webapp/common/error.zul:21 -msgid "LibrePlan: Runtime Error" -msgstr "LibrePlan: Erro de execución" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:416 +msgid "Effort cannot be null" +msgstr "O esforzo non pode ser nulo" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:52 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:39 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:43 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:217 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1015 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:38 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:211 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:191 -#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:34 -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:49 -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:55 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:101 +#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:58 +#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:47 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:103 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:49 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:92 -#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:46 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:94 +#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:45 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:41 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:136 -#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:40 -#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:44 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:87 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:77 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:84 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:139 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:81 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:141 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:134 -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:99 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:243 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:138 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:70 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:80 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:85 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:88 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:142 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:139 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:100 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:379 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:50 -#: libreplan-webapp/src/main/webapp/planner/order.zul:72 -#: libreplan-webapp/src/main/webapp/planner/order.zul:135 -#: libreplan-webapp/src/main/webapp/planner/order.zul:170 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:85 -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:41 +#: libreplan-webapp/src/main/webapp/planner/order.zul:73 +#: libreplan-webapp/src/main/webapp/planner/order.zul:134 +#: libreplan-webapp/src/main/webapp/planner/order.zul:169 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:91 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:81 msgid "Cancel" msgstr "Cancelar" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:32 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:35 msgid "General user data" msgstr "Datos xerais do usuario" @@ -2786,7 +2785,7 @@ msgstr "Quitar planificación" msgid "Subcontracted task sent successfully" msgstr "A tarefa subcontratada enviouse con éxito" -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:73 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:77 msgid "Accumulated hours chart" msgstr "Gráfico de horas acumuladas" @@ -2798,13 +2797,13 @@ msgstr "Lista de máquinas" msgid "CPI" msgstr "CPI" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:660 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:923 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:526 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:687 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:318 msgid "You don't have read access to this project" msgstr "Non ten acceso de lectura a este proxecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:180 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:96 msgid "" "Disable hierarchy will cause criteria tree to be flattened. Are you sure?" msgstr "" @@ -2817,17 +2816,13 @@ msgstr "" msgid "Units" msgstr "Unidades" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:45 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:52 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:47 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:41 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:48 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:43 msgid "Dates" msgstr "Datas" -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:45 -msgid "Create Calendar" -msgstr "Crear Calendario" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:185 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:168 msgid "At least one stretch is needed" msgstr "Necesítase alo menos un tramo" @@ -2835,10 +2830,22 @@ msgstr "Necesítase alo menos un tramo" msgid "a day is not valid" msgstr "un día non é válido" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:87 +msgid "Autocomplete login form" +msgstr "Autocompletar o formulario de inicio de sesión" + +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21 +msgid "LibrePlan: Project Costs Per Resource" +msgstr "LibrePlan: Custos de proxectos por recurso" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesCommand.java:61 msgid "Task Properties" msgstr "Propiedades da tarefa" +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21 +msgid "LibrePlan: Task Scheduling Status In Project" +msgstr "LibrePlan: Estado de planificación de proxecto" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:229 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:237 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:214 @@ -2847,20 +2854,11 @@ msgid "" msgstr "" "Data de fin inválida, a data de fin nova debe ser posterior á data de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:192 -msgid "Cost category saved" -msgstr "Categoría de custo gardada" - #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27 -#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:33 msgid "name" msgstr "nome" -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:170 -msgid "Progress type saved" -msgstr "Tipo de progreso gardado" - -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:73 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:75 msgid "Delete selected task" msgstr "Borrar tarefa seleccionada" @@ -2868,10 +2866,14 @@ msgstr "Borrar tarefa seleccionada" msgid "{0} (max: {1})" msgstr "{0} (máx: {1})" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:459 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:470 msgid "end" msgstr "fin" +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:529 +msgid "Cost Category" +msgstr "Categoría de custo" + #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:63 msgid "Log" msgstr "Diario" @@ -2894,7 +2896,7 @@ msgstr "Editar tarefa: {0}" msgid "Start date cannot be null" msgstr "A data de inicio non pode ser nula" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:297 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298 msgid "Subcontracting" msgstr "Subcontratación" @@ -2902,7 +2904,7 @@ msgstr "Subcontratación" msgid "references" msgstr "referencias" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1284 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1278 msgid "Value is not valid, the Precision value must be exact " msgstr "O valor non é válido, o valor de precisión debe ser exacto " @@ -2914,7 +2916,11 @@ msgstr "Xenérico" msgid "Planned workable days :" msgstr "Días laborais planificados :" -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:47 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:51 +msgid "Template" +msgstr "Modelo" + +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:49 msgid "Default max value" msgstr "Valor máximo por defecto" @@ -2922,7 +2928,7 @@ msgstr "Valor máximo por defecto" msgid "Add criterion requirement" msgstr "Engadir criterio requirido" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:879 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:855 msgid "" "You can not remove the project \"{0}\" because of any of its tasks are " "already in use in some work reports and the project just exists in the " @@ -2939,13 +2945,14 @@ msgstr "Porcentaxe de horas presupostadas / horas consumidas" msgid "Criterion Name" msgstr "Nome do criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:498 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:502 msgid "Automatic" msgstr "Automático" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:91 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:93 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:133 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48 msgid "Task" msgstr "Tarefa" @@ -2954,20 +2961,28 @@ msgstr "Tarefa" msgid "Planned end :" msgstr "Fin planificado :" +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:21 +msgid "LibrePlan: Change password" +msgstr "LibrePlan: Cambiar o contrasinal" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:85 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:270 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:128 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:167 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:124 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:165 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:302 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:130 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:169 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:125 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:168 msgid "please, select a label" msgstr "por favor, seleccione unha etiqueta" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:106 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:123 msgid "Add profile" msgstr "Engadir perfil" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:215 +#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:23 +msgid "LibrePlan: Scenarios Management" +msgstr "LibrePlan: Xestión de escenarios" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:220 msgid "filter already exists" msgstr "o filtro xa existe" @@ -2985,6 +3000,10 @@ msgstr "Nome do criterio" msgid "values are not valid, the values must not be null" msgstr "os valores non son válidos, non deben ser nulos" +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:41 +msgid "Apply changes and go back to scheduling" +msgstr "Aplicar cambios e volver á planificación" + #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:78 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:32 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50 @@ -2997,9 +3016,9 @@ msgstr "recurso da asignación de custo non especificado" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:127 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:135 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:68 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:49 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:132 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45 #: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderTemplate.java:73 msgid "Project" msgstr "Proxecto" @@ -3008,11 +3027,7 @@ msgstr "Proxecto" msgid "Unassigned" msgstr "Non asignado" -#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:25 -msgid "Select the date from which the new version will be valid" -msgstr "Seleccione a data a partir da cal a versión nova será válida" - -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:101 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:102 msgid "Add new criterion requirement" msgstr "Engadir novo criterio requirido" @@ -3020,11 +3035,11 @@ msgstr "Engadir novo criterio requirido" msgid "Budgeted Cost Work Performed" msgstr "Custo presupostado do traballo realizado" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:135 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:138 msgid "Change the password" msgstr "Cambiar o contrasinal" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:95 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:115 msgid "Work report" msgstr "Parte de traballo" @@ -3032,24 +3047,29 @@ msgstr "Parte de traballo" msgid "the name must be not empty" msgstr "o nome non pode ser baleiro" -#: libreplan-webapp/src/main/webapp/materials/materials.zul:86 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:58 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:85 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:71 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:27 msgid "Disabled" msgstr "Deshabilitado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:731 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:347 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:701 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:326 msgid "Earned value" msgstr "Valor gañado" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:216 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:151 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35 +msgid "Overtime Effort" +msgstr "Esforzo extra" + +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:219 msgid "Inherited from parent calendar" msgstr "Herdado do calendario pai" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:146 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:184 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:210 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:149 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:187 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:213 msgid "Normal Effort" msgstr "Esforzo normal" @@ -3067,51 +3087,48 @@ msgstr "" "tentando crear un modelo a partir dunha tarefa nova.\n" "Por favor garde o seu proxecto antes de continuar." -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:92 -msgid "Edit Work Hours Type" -msgstr "Editar tipo de horas de traballo" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:43 -msgid "From Today" -msgstr "A partir de hoxe" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1060 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1075 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1114 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1129 msgid "{0} not supported yet" msgstr "{0} aínda non soportado" +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:143 +msgid "is not supported for its use with LibrePlan." +msgstr "no está soportado para o seu uso con LibrePlan." + #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:53 msgid "New entry" msgstr "Entrada nova" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:211 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:220 msgid "Some sequences to remove not existed" msgstr "Algunhas secuencias para borrar non existen" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:105 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:114 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:212 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:100 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:109 msgid "Resources Load" msgstr "Carga de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:211 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:214 msgid "Changes have been canceled" msgstr "Cambios cancelados" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:266 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:281 -msgid "Machine saved" -msgstr "Máquina gardada" +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:21 +msgid "LibrePlan: Hours Worked Per Worker In A Month" +msgstr "LibrePlan: Horas traballadas por traballador nun mes" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:143 -msgid "Create Cost Category" -msgstr "Crear categoría de custo" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:297 +msgid "Authentication" +msgstr "Autenticación" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:63 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "March" msgstr "Marzo" +#: libreplan-webapp/src/main/webapp/settings/settings.zul:85 +msgid "Select language" +msgstr "Seleccionar idioma" + #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:104 msgid "Appropriative allocation" msgstr "Asignación apropiativa" @@ -3120,11 +3137,11 @@ msgstr "Asignación apropiativa" msgid "Assigned criterion requirements" msgstr "Criterios requiridos asignados" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:140 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:157 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:119 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:119 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:127 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:144 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:153 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:115 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:115 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:123 msgid "Filter by criteria" msgstr "Filtrar por criterios" @@ -3137,11 +3154,11 @@ msgstr "Valor máximo" msgid "Scenarios List" msgstr "Lista de escenarios" -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:156 +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:115 msgid "The name is not valid, the name must not be null " msgstr "O nome non é válido, non debe ser nulo " -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:139 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136 msgid "Hours to allocate" msgstr "Horas a asignar" @@ -3149,7 +3166,7 @@ msgstr "Horas a asignar" msgid "A category must be selected" msgstr "Debe seleccionar unha categoría" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:134 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:137 msgid "Period" msgstr "Periodo" @@ -3162,91 +3179,84 @@ msgstr "Propagación" msgid "Select start date" msgstr "Seleccionar data de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:188 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:214 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:877 +msgid "Removed {0}" +msgstr "{0} borrado" + +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:106 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:152 msgid "Error on showing warning message removing typeOfWorkHours: " msgstr "" "Erro ao mostrar mensaxe de advertencia borrando tipo de horas de traballo: " -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:153 -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:151 -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:189 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:901 -msgid "Removed {0}" -msgstr "{0} borrado" - -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:818 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821 msgid "Confirm deleting this worker. Are you sure?" msgstr "Confirmar o borrado deste traballador. ¿Está seguro?" -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:62 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:64 msgid "Group name" msgstr "Nome do grupo" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:51 msgid "Start date:" msgstr "Data de inicio:" -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:57 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:81 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:59 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:98 msgid "Role name" msgstr "Nome do rol" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:837 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:840 msgid "This worker was already removed by other user" msgstr "Este traballador xa foi borrado por outro usuario" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:611 -msgid "Create Work Report" -msgstr "Crear parte de traballo" - -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:116 -msgid "Value is not valid, the precision value must not be empty" -msgstr "O valor non é válido, o valor de precisión non debe estar baleiro" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:821 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:484 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:791 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:474 msgid "h" msgstr "h" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:359 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:620 +msgid "Create Work Report" +msgstr "Crear parte de traballo" + +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:75 +msgid "Value is not valid, the precision value must not be empty" +msgstr "O valor non é válido, o valor de precisión non debe estar baleiro" + +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:363 msgid "Workable capacity for this period " msgstr "Capacidade de traballo para este período " -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:218 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:150 #: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:159 msgid "Cannot be null or empty" msgstr "Non pode ser nulo ou baleiro" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:190 -msgid "Cannot delete profile: it does not exist anymore" -msgstr "Non se pode borrar o perfil: xa non existe" +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:440 +msgid "Quality Form" +msgstr "Formulario de calidade" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:225 -msgid "Edit Machine" -msgstr "Editar máquina" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:77 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:67 msgid "Add Milestone" msgstr "Engadir fito" -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:119 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:116 msgid "Assign selected items" msgstr "Asignar elementos seleccionados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:438 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:449 msgid "init" msgstr "inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1212 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1215 msgid "Add new progress measurement" msgstr "Engadir nova medida de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:528 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:532 msgid "Select for automatic queuing" msgstr "Seleccione para encolar automáticamente" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 msgid "Scenarios Management" msgstr "Administración de escenarios" @@ -3258,86 +3268,96 @@ msgstr "Proxecto {0} transferido" msgid "Create & Assign" msgstr "Crear e asignar" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:148 -msgid "Edit User" -msgstr "Editar usuario" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1549 +msgid "Not configurable" +msgstr "Non configurable" -#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:55 -msgid "Maximum/minimum of the estimated hours" -msgstr "Máximo/mínimo das horas estimadas" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationCommand.java:47 +msgid "Advanced allocation" +msgstr "Asignación avanzada" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:753 -msgid "D" -msgstr "D" - -#: libreplan-webapp/src/main/webapp/planner/order.zul:112 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:90 +#: libreplan-webapp/src/main/webapp/planner/order.zul:111 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:93 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:96 msgid "Consolidated" msgstr "Consolidado" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:125 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:145 msgid "Work report types" msgstr "Tipos de partes de traballo" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:182 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:174 msgid "MonteCarlo method" msgstr "Método de Montecarlo" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1057 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1220 msgid "derived exception can not be removed" msgstr "a excepción derivada non se pode borrar" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:287 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:307 +msgid "Edit Worker: {0}" +msgstr "Editar traballador: {0}" + #: libreplan-webapp/src/main/java/org/libreplan/ws/materials/impl/MaterialConverter.java:217 msgid "missing code in a material" msgstr "falta o código nun material" +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:21 +msgid "LibrePlan: User access" +msgstr "LibrePlan: Acceso de usuarios" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:61 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:67 #: libreplan-webapp/src/main/webapp/orders/_list.zul:32 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:109 msgid "Customer" msgstr "Cliente" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:810 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:820 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:86 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 msgid "Hours type" msgstr "Tipo de horas" #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:156 -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:210 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:211 msgid "criterion type name not specified" msgstr "nome do tipo de criterio non especificado" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:246 +msgid "Cannot connect to LDAP server" +msgstr "Non se pode conectar ao servidor de LDAP" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:220 msgid "Add Exception" msgstr "Engadir excepción" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:405 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:427 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:451 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:301 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:322 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:346 msgid "cannot be empty" msgstr "non pode ser baleiro" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1468 -msgid "Sigmoid function" -msgstr "Función sigmoide" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:421 +msgid "Effort must be greater than zero" +msgstr "O esforzo debe ser maior que cero" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:49 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:48 -#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:27 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:47 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:40 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:27 msgid "from" msgstr "desde" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:147 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:146 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:121 msgid "Heading Fields" msgstr "Campos de cabeceira" -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:74 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:84 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:70 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:80 msgid "Progress type" msgstr "Tipo de progreso" @@ -3357,7 +3377,7 @@ msgstr "" "O período de tempo contén datos inválidos. A data de fin debe ser maior cá " "de inicio" -#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:43 +#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:33 msgid "Save Project" msgstr "Gardar proxecto" @@ -3366,8 +3386,8 @@ msgstr "Gardar proxecto" msgid "Day is not valid" msgstr "O día non é válido" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:627 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1097 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:619 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1256 msgid "You should select a start date for the exception" msgstr "Debe seleccionar unha data de inicio para a excepción" @@ -3383,6 +3403,10 @@ msgstr "Desviación ao custo final" msgid "Exportation options" msgstr "Opcións de exportación" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java:92 +msgid "Settings saved" +msgstr "Preferencias gardadas" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:160 msgid "" "Could not save time period. Time period overlaps with another non-compatible " @@ -3391,83 +3415,83 @@ msgstr "" "Non se puido gardar o período de tiempo. O período solápase con outro " "período de tempo incompatible" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:375 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:376 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ScenarioBandboxFinder.java:46 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/BaseCalendarBandboxFinder.java:46 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:493 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:978 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:88 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:441 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:94 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:42 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:43 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:156 -#: libreplan-webapp/src/main/webapp/calendars/_list.zul:27 +#: libreplan-webapp/src/main/webapp/calendars/_list.zul:28 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:40 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:31 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:52 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:55 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:56 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:35 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:27 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:45 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:25 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:38 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:39 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:91 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:90 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:26 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:41 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:74 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:42 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77 #: libreplan-webapp/src/main/webapp/materials/materials.zul:58 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:41 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:82 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:42 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:84 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:67 -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:77 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:76 #: libreplan-webapp/src/main/webapp/scenarios/_list.zul:27 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:31 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:50 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:49 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:30 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:51 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:50 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:39 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:32 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:52 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:50 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:52 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:51 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:40 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:35 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:115 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 #: libreplan-webapp/src/main/webapp/orders/_list.zul:28 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:72 #: libreplan-webapp/src/main/webapp/templates/templates.zul:80 #: libreplan-webapp/src/main/webapp/templates/_list.zul:27 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:80 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:32 #: libreplan-webapp/src/main/webapp/planner/main.zul:49 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:89 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:120 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:162 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:138 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:179 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:100 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:141 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:98 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:100 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:141 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:108 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:149 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:85 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:124 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:166 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:90 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:134 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:175 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:96 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:94 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:96 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:137 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:104 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:145 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:115 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:45 msgid "Name" msgstr "Nome" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:162 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:168 msgid "Delete task" msgstr "Borrar tarefa" @@ -3479,11 +3503,11 @@ msgstr "Segundos" msgid "please, select an item" msgstr "por favor, seleccione un elemento" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:392 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:397 msgid "Time Start cannot be null" msgstr "A hora de inicio non pode ser nula" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:208 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:212 msgid "Day of week" msgstr "Día da semana" @@ -3491,12 +3515,12 @@ msgstr "Día da semana" msgid "Companies List" msgstr "Lista de empresas" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1443 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1453 msgid "Stretches with Interpolation" msgstr "Tramos con interpolación" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:333 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:37 msgid "Hours Worked Per Resource" msgstr "Horas traballadas por recurso" @@ -3508,19 +3532,20 @@ msgstr "A data de fin non pode ser anterior á data de inicio" msgid "cost assignment with end date less than start date" msgstr "a asignación de custo ten data de fin anterior á de inicio" -#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:63 -msgid "Maximum/minimum of the worked hours" -msgstr "Máximo/mínimo das horas traballadas" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:91 +msgid "" +"Enable/Disable autocomplete property in login form, if the admin password is " +"still in default" +msgstr "" +"Habilitar/Deshabilitar a propiedade de autocompletado no formulario de " +"inicio de sesión, se o contrasinal de admin tovadía é o contrasinal por " +"defecto" -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:35 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26 msgid "Category name" msgstr "Nome da categoría" -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21 -msgid "LibrePlan: Work And Progress Per Task" -msgstr "LibrePlan: Traballo e progreso por tarefa" - #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:766 msgid "Not the same material, impossible to update" msgstr "Non é o mesmo material, imposible actualizar" @@ -3529,10 +3554,6 @@ msgstr "Non é o mesmo material, imposible actualizar" msgid "Main menu" msgstr "Menú principal" -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:22 -msgid "LibrePlan: Progress" -msgstr "LibrePlan: Progreso" - #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:31 msgid "MonteCarlo" msgstr "Montecarlo" @@ -3541,15 +3562,23 @@ msgstr "Montecarlo" msgid "Duration" msgstr "Duración" -#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:39 -msgid "Create From Template" -msgstr "Crear a partir de modelo" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:585 +msgid "Exception: {0}" +msgstr "Excepción: {0}" + +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:46 +msgid "Password settings" +msgstr "Configuración do contrasinal" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:381 msgid "There exists other workReportType with the same name." msgstr "Xa existe outro tipo de parte de traballo co mesmo nome." -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:150 +#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:22 +msgid "LibrePlan: Progress" +msgstr "LibrePlan: Progreso" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:149 #: libreplan-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:29 msgid "Schedule" msgstr "Planificar" @@ -3568,45 +3597,41 @@ msgstr "Inesperado: {0}" msgid "Notes" msgstr "Notas" -#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:224 +#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:178 msgid "Connect" msgstr "Conectar" -#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:21 -msgid "LibrePlan: Units" -msgstr "LibrePlan: Unidades" - -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:23 -msgid "LibrePlan: Transfer Projects Between Scenarios" -msgstr "LibrePlan: Transferir proxectos entre escenarios" - -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:221 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:223 msgid "Allocation: [{0},{1}]" msgstr "Asignación: [{0},{1}]" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:194 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:892 +msgid "Virtual Workers Group" +msgstr "Grupo de traballadores virtuais" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:198 msgid "Changes saved" msgstr "Cambios gardados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1281 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1258 msgid "See scheduling" msgstr "Ver planificación" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:338 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:341 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:107 msgid "Progress measurements" msgstr "Medidas de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1211 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1214 msgid "Add measure" msgstr "Engadir medida" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:253 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:258 msgid "Work report saved" msgstr "Parte de traballo gardado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractCommand.java:52 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:374 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractCommand.java:53 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:377 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:68 msgid "Subcontract" msgstr "Subcontratar" @@ -3626,7 +3651,7 @@ msgstr "Relación" msgid "End" msgstr "Fin" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1366 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1360 msgid "The date is not valid, the date must be not empty" msgstr "A data non é válida, non debe ser baleira" @@ -3634,26 +3659,30 @@ msgstr "A data non é válida, non debe ser baleira" msgid "User login name" msgstr "Nome de usuario" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:534 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318 msgid "Cost Categories" msgstr "Categorías de custo" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:312 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:313 msgid "criterion type not specified" msgstr "tipo de criterio non especificado" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:343 +msgid "Role property:" +msgstr "Propiedade do rol:" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignController.java:143 msgid "must be not empty" msgstr "non pode ser baleiro" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "April" msgstr "Abril" -#: libreplan-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:23 -msgid "LibrePlan: Companies" -msgstr "LibrePlan: Empresas" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:301 +msgid "Derived of Calendar " +msgstr "Derivado do calendario " #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:22 msgid "Users List" @@ -3665,16 +3694,20 @@ msgstr "Lista de usuarios" msgid "Task quality forms" msgstr "Formularios de calidade de tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:600 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:593 msgid "Not working day" msgstr "Día non laborable" +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:237 +msgid "Progress Types" +msgstr "Tipos de progreso" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnum.java:29 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:135 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:155 msgid "Cost category" msgstr "Categoría de custo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:697 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:700 msgid "It can not be deleted. At least one sequence is necessary." msgstr "Non se pode borrar. Polo menos unha secuencia é necesaria." @@ -3682,23 +3715,29 @@ msgstr "Non se pode borrar. Polo menos unha secuencia é necesaria." msgid "Resource allocation" msgstr "Asignación de recursos" -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:51 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:50 msgid "Amount work" msgstr "Cantidade de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:171 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:172 msgid "please, select a quality form" msgstr "por favor, seleccione un formulario de calidade" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:201 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:195 msgid "Select entity:" msgstr "Seleccione entidade:" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:522 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:907 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:132 +msgid "Edit {0}: {1}" +msgstr "Editar {0}: {1}" + #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:400 msgid "Exist other workReportType with the same code." msgstr "Xa existe outro tipo de parte de traballo co mesmo código." -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:65 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:67 msgid "Unindent selected task" msgstr "Desindentar tarefa seleccionada" @@ -3710,20 +3749,11 @@ msgstr "Código de referencia do cliente" msgid "Constraint" msgstr "Restrición" -#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:155 -msgid "Create Exception Day Type" -msgstr "Crear tipo de día de excepción" - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:333 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:41 -msgid "Hours Worked Per Resource In A Month" -msgstr "Horas traballadas por recurso nun mes" - #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150 msgid "Add New Label Type Field" msgstr "Engadir novo campo de tipo de etiqueta" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:402 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:407 msgid "Time finish cannot be null" msgstr "A hora de fin non pode ser nula" @@ -3731,23 +3761,22 @@ msgstr "A hora de fin non pode ser nula" msgid "Customer reference" msgstr "Referencia del cliente" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:329 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:661 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:740 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:865 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:915 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:924 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:947 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:145 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:189 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:461 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:759 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:517 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:527 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:688 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:841 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:891 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:900 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:927 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:146 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:360 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:309 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:319 msgid "Information" msgstr "Información" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:946 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:926 msgid "Sorry, you do not have permissions to access this project" msgstr "Sentímolo, non ten permisos para acceder a este proxecto" @@ -3755,11 +3784,11 @@ msgstr "Sentímolo, non ten permisos para acceder a este proxecto" msgid "END" msgstr "FIN" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:223 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:226 msgid "Worker saved" msgstr "Traballador gardado" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:261 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:266 msgid "can not pass until the previous item is passed." msgstr "non se pode pasar mentres o elemento anterior non sexa pasado." @@ -3767,11 +3796,7 @@ msgstr "non se pode pasar mentres o elemento anterior non sexa pasado." msgid "New hours group " msgstr "novo grupo de horas " -#: libreplan-webapp/src/main/webapp/qualityforms/qualityForms.zul:22 -msgid "LibrePlan: Quality Forms" -msgstr "LibrePlan: Formularios de calidade" - -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:460 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:464 msgid "Assign element to queue manually" msgstr "Asignar elemento á cola manualmente" @@ -3779,15 +3804,15 @@ msgstr "Asignar elemento á cola manualmente" msgid "Edit Template" msgstr "Editar modelo" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:216 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:218 msgid "Resource: {0} " msgstr "Recurso: {0} " -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:463 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:358 msgid "percentage cannot be duplicated" msgstr "a porcentaxe non pode estar duplicada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 msgid "Work Hours" msgstr "Horas de traballo" @@ -3795,7 +3820,7 @@ msgstr "Horas de traballo" msgid "Heading" msgstr "Cabeceira" -#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:164 +#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:165 msgid "Company ID already used. It has to be be unique" msgstr "NIF da empresa xa está sendo usado. Debe ser único" @@ -3807,23 +3832,20 @@ msgstr "Non hai ningunha categoría de materiais con este código" msgid "Percentages should sum 100" msgstr "As porcentaxes deberían sumar 100" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:284 -msgid "Could not save machine" -msgstr "Non se puido gardar a máquina" - #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:339 msgid "The calendar exception type not found" msgstr "Tipo de excepción de calendario non atopado" #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/ResourceEnumConverter.java:81 +#: libreplan-webapp/src/main/java/org/libreplan/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java:106 msgid "Unable to convert value to {0} type" msgstr "No se puido convertir o valor a tipo {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:220 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:223 msgid "Worker must be not-null" msgstr "O traballador non debe ser nulo" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1067 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1063 msgid "Some criterion satisfactions overlap in time" msgstr "Algúns criterios satisfeitos solápanse no tempo" @@ -3831,34 +3853,43 @@ msgstr "Algúns criterios satisfeitos solápanse no tempo" msgid "Value last progress measurement" msgstr "Valor da última medida de progreso" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:43 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 +msgid "LibrePlan: Materials Needs At Date" +msgstr "LibrePlan: Necesidades de materiais en data" + +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44 msgid "Worker assignments" msgstr "Asignacións de traballador" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:541 -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:402 -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:147 -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:174 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:610 +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:270 +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:154 +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:182 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java:173 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:409 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:431 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:305 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:326 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:221 msgid "{0} already exists" msgstr "{0} xa existe" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:314 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:318 msgid "Create Worker" msgstr "Crear traballador" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:587 +msgid "Exception: {0} (Inh)" +msgstr "Excepción: {0} (Her)" + #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:38 msgid "Code " msgstr "Código" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:52 +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:66 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:65 msgid "Password confirmation" msgstr "Confirmación de contrasinal" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:69 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:71 msgid "Indent selected task" msgstr "Indentar tarefa seleccionada" @@ -3866,12 +3897,13 @@ msgstr "Indentar tarefa seleccionada" msgid "Work Report" msgstr "Parte de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:115 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:189 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:135 msgid "Unit Measures" msgstr "Unidades de medida" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:63 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:72 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:39 msgid "Show progress" msgstr "Mostrar progreso" @@ -3880,7 +3912,15 @@ msgstr "Mostrar progreso" msgid "Work" msgstr "Traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:459 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:297 +msgid "" +"Error saving the project\n" +"{0}" +msgstr "" +"Erro gardando un proxecto\n" +"{0}" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:358 msgid "" "The task has got progress consolidations. It must delete all consolidations " "to change the resource allocation type " @@ -3888,10 +3928,15 @@ msgstr "" "A tarefa ten consolidacións de progreso. Debe borrar as consolidacións para " "cambiar o tipo de asignación de recursos " -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:626 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403 +#: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22 +msgid "LibrePlan: Machines" +msgstr "LibrePlan: Máquinas" + +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:630 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:298 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:121 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1335 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1296 msgid "Error" msgstr "Erro" @@ -3911,15 +3956,15 @@ msgstr "" msgid "ETC" msgstr "ETC" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:104 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:105 msgid "Log out" msgstr "Saír" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:24 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:25 msgid "Add new configuration unit" msgstr "engadir nova unidade de configuración" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:37 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:41 msgid "Main preferences" msgstr "Preferencias principais" @@ -3932,24 +3977,20 @@ msgstr "" "criterionType" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationCommand.java:67 -#: libreplan-webapp/src/main/webapp/planner/order.zul:82 +#: libreplan-webapp/src/main/webapp/planner/order.zul:83 msgid "Progress consolidation" msgstr "Consolidación de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:246 -msgid "Label type saved" -msgstr "Tipo de etiqueta gardado" - -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:419 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:568 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:406 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:556 msgid "missing field name in a description value" msgstr "falta o nome de campo nun valor de descrición" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:46 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:47 msgid "Add new worker assignment" msgstr "Engadir nova asignación de traballador" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:441 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:688 msgid "Show all elements" msgstr "Mostrar todos os elementos" @@ -3957,11 +3998,11 @@ msgstr "Mostrar todos os elementos" msgid "It couldn't complete all the reassignations" msgstr "No se puideron completar todas as reasignacións" -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:77 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:73 msgid "Show dependencies:" msgstr "Mostrar dependencias:" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:66 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:68 msgid "Limited resource" msgstr "Recursos limitantes" @@ -3969,6 +4010,10 @@ msgstr "Recursos limitantes" msgid "Task Information" msgstr "Información da tarefa" +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:111 +msgid "Apply filter to: " +msgstr "Aplicar filtro a:" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:140 msgid "Hours Group at " msgstr "Grupo de horas en " @@ -3979,8 +4024,8 @@ msgstr "" "A súa sesión expirou tras un tiempo de inactividade. Por favor, inicie " "sesión de novo." -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:166 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:191 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:165 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:190 msgid "SPREAD" msgstr "PROPAGACIÓN" @@ -3992,27 +4037,31 @@ msgstr "un día está baleiro" msgid "Budgeted Cost Work Scheduled" msgstr "Custo de traballo presupostado planificado" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:57 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703 +msgid "Changes applied" +msgstr "Cambios aplicados" + +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:58 msgid "Name cannot be null or empty" msgstr "O nome non pode ser nulo ou baleiro" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:341 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:344 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110 msgid "Progress measurements: " msgstr "Medidas de progreso: " +#: libreplan-webapp/src/main/webapp/common/configuration.zul:43 +msgid "LDAP configuration" +msgstr "Configuración do LDAP" + #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:32 msgid "Queue Element Information" msgstr "Información de elemento de cola" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:136 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:139 msgid "Start Date" msgstr "Data de inicio" -#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:31 -msgid "Create Order" -msgstr "Crear proxecto" - #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:22 msgid "Virtual Workers Groups List" msgstr "Lista de grupos de traballadores virtuais" @@ -4021,13 +4070,13 @@ msgstr "Lista de grupos de traballadores virtuais" msgid "Cost Variance" msgstr "Desviación en custo" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:470 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:471 msgid "criterion type does not allow resource hierarchy" msgstr "o tipo de criterio non permite xerarquía de recursos" #: libreplan-webapp/src/main/webapp/orders/_edition.zul:150 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:89 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:95 msgid "Total" msgstr "Total" @@ -4040,25 +4089,26 @@ msgstr "Invalidar" msgid "Budget hours" msgstr "Horas do presuposto" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:165 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:150 msgid "Edit task: {0}" msgstr "Editar tarefa: {0}" -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:53 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:52 msgid "Select destination" msgstr "Seleccionar destino" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:269 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:529 +#: libreplan-webapp/src/main/webapp/planner/order.zul:92 +#: libreplan-webapp/src/main/webapp/planner/order.zul:98 +msgid "Check consolidated progresses" +msgstr "Marcar progresos consolidados" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:274 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:530 msgid "must be greater than the previous date." msgstr "debe ser maior cá data anterior." -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:22 -msgid "LibrePlan: Advanced allocation" -msgstr "LibrePlan: Asignación avanzada" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1481 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:583 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1469 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:585 msgid "Show all" msgstr "Mostrar todo" @@ -4067,19 +4117,20 @@ msgid "Estimated hours" msgstr "Horas estimadas" #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:57 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:59 msgid "Default price" msgstr "Prezo por defecto" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:116 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:121 msgid "Apply tab changes" msgstr "Aplicar cambios da pestana" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:274 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:93 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:171 msgid "passwords don't match" msgstr "os contrasinais non coinciden" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:85 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:88 msgid "Day properties" msgstr "Propiedades do día" @@ -4095,7 +4146,7 @@ msgstr "Transferir" msgid "Work Hours Types List" msgstr "Lista de tipos de horas de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:62 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:54 msgid "new milestone" msgstr "novo fito" @@ -4103,19 +4154,11 @@ msgstr "novo fito" msgid "Value last progress reported" msgstr "Valor último progreso notificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300 msgid "Report Progress" msgstr "Notificar progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:154 -msgid "Unit {0} cannot be removed because it is used in materials" -msgstr "A unidade {0} non pode borrarse porque está a ser usada en materiais" - -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:133 -msgid "Create User" -msgstr "Crear usuario" - -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339 msgid "Schedule from start to deadline" msgstr "Planificar dende o principio á data límite" @@ -4125,33 +4168,45 @@ msgstr "Planificar dende o principio á data límite" msgid "Estimated days" msgstr "Días estimadas" -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:65 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:61 msgid "Reference date" msgstr "Data de referencia" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:46 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:21 +msgid "LibrePlan: Estimated/Planned Hours Per Task" +msgstr "LibrePlan: Horas estimadas/planificadas por tarefa" + +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:48 msgid "Selected node:" msgstr "Nodo seleccionado:" -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21 -msgid "LibrePlan: Task Scheduling Status In Project" -msgstr "LibrePlan: Estado de planificación de proxecto" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:55 +msgid "From chosen date" +msgstr "A partir da data escollida" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:249 -msgid "Create new project from template" -msgstr "Crear novo proxecto a partir de modelo" - -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:74 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:81 msgid "Progress Evolution" msgstr "Evolución do progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:112 +#: libreplan-webapp/src/main/webapp/excetiondays/exceptionDays.zul:22 +msgid "LibrePlan: Exception Days" +msgstr "LibrePlan: Días de excepción" + +#: libreplan-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:23 +msgid "LibrePlan: Work Hours" +msgstr "LibrePlan: Horas de traballo" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 +msgid "LibrePlan Configuration" +msgstr "LibrePlan: Configuración" + +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:118 msgid "Complete, Partially or Not Scheduled. (Drag and drop to move tasks)" msgstr "" "Completa, parcialmente ou non planificada. (Pinche e arrastre para mover " "tarefas)" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:88 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91 msgid "Original" msgstr "Orixinal" @@ -4172,21 +4227,21 @@ msgstr "Non indentable" msgid "Resource allocation type" msgstr "Tipo de asignación de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:491 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:70 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:493 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:71 msgid "List of materials for all categories (select one to filter)" msgstr "" "Lista de materiais paa tódalas categorías (seleccione unha para filtrar)" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:99 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:103 msgid "User disabled" msgstr "Usuario deshabilitado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:733 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:788 msgid "In the available periods {0} only {1} hours are available." msgstr "Nos períodos dispoñibles {0} só hai dispoñibles {1} horas." -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:100 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:118 msgid "Association with profiles" msgstr "Asociación con perfís" @@ -4199,20 +4254,28 @@ msgstr "Tarefa {0} : Código duplicado en BD" msgid "Message - {0}" msgstr "Mensaxe - {0}" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:121 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:21 +msgid "LibrePlan: Settings" +msgstr "LibrePlan: Preferencias" + +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:124 msgid "worker's surname not specified" msgstr "apelidos do traballador non especificados" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:211 -msgid "Error on removing workReportType: " -msgstr "Erro ao borrar tipo de parte de traballo: " - #: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:41 #: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:48 msgid "Save changes" msgstr "Gardar cambios" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:669 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:77 +msgid "Application settings" +msgstr "Preferencias da aplicación" + +#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:47 +msgid "Average of estimated hours" +msgstr "Media de horas estimadas" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:682 msgid "" "You can not remove the task \"{0}\" because of this or any of its children " "are already in use in some work reports" @@ -4220,59 +4283,63 @@ msgstr "" "Non se pode borrar a tarefa \"{0}\" porque algún dos seus fillos está a " "usarse nalgún parte de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:192 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:203 msgid "Total dedication" msgstr "Dedicación total" -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:45 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:44 msgid "Select source" msgstr "Seleccionar orixe" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:825 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:828 msgid "Worker deleted" msgstr "Traballador borrado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:735 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:733 msgid "Select entity, please" msgstr "Seleccionar entidade, por favor" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:293 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:291 msgid "Stretch date must not be greater than the task's end date: " msgstr "A data do tramo non debe ser menor cá data de fin da tarefa: " +#: libreplan-webapp/src/main/webapp/users/profiles.zul:23 +msgid "LibrePlan: Profiles" +msgstr "LibrePlan: Perfís" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:38 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44 msgid "Subcontratation date" msgstr "Data de subcontratación" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:212 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:207 msgid "Number of digits:" msgstr "Número de díxitos:" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:93 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:182 +#: 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/java/org/libreplan/web/labels/LabelTypeCRUDController.java:233 -msgid "Edit Label Type" -msgstr "Editar tipo de etiqueta" +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:54 +msgid "Current password" +msgstr "Contrasinal actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:911 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1197 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:349 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1181 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:276 msgid "Please, select an item" msgstr "Por favor, seleccione un elemento" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:180 -msgid "Work report type saved" -msgstr "Tipo de partes de traballo gardado" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1122 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1096 msgid "Cannot be higher than finish hour" msgstr "Non pode ser posterior á data de fin" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:225 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:223 msgid "Prefix" msgstr "Prefixo" @@ -4285,44 +4352,48 @@ msgstr "Código subcontratado" msgid "New Template element" msgstr "Novo elemento de modelo" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:21 -msgid "LibrePlan: Hours Worked Per Worker In A Month" -msgstr "LibrePlan: Horas traballadas por traballador nun mes" - #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:251 #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:325 msgid "The base calendar parent not found" msgstr "Calendario base pai non atopado" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:94 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:97 msgid "Non Consolidated" msgstr "Non consolidado" +#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:43 +msgid "From date" +msgstr "A partir da data" + #: libreplan-webapp/src/main/webapp/planner/reassign.zul:34 msgid "Reassigning type" msgstr "Tipo de reasignación" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:295 -msgid "Edit Virtual Workers Group" -msgstr "Editar grupo de traballadores virtuais" +#: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:22 +msgid "LibrePlan: Virtual Workers Groups" +msgstr "LibrePlan: Grupos de traballadores virtuais" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:441 +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:190 +msgid "{0} \"{1}\" can not be deleted because of it is being used" +msgstr "{0} \"{1}\" non se pode borrar porque está sendo usado" + +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:445 msgid "Edit limiting resource element" msgstr "Editar elemento de recurso limitante" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:862 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:770 msgid "The field name must be unique, not null and not empty" msgstr "O nome do campo debe ser único, non nulo e non baleiro" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:381 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:382 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:136 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:157 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85 msgid "Position" msgstr "Posición" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:104 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:108 msgid "Incorrect authentication" msgstr "Identificación incorrecta" @@ -4336,15 +4407,15 @@ msgstr "Editar tarefa" msgid "Edit work report" msgstr "Editar parte de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:45 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:44 msgid "Limiting resources (project)" msgstr "Recursos limitantes (proxecto)" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:764 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:672 msgid "A description field of the same name already exists." msgstr "Xa existe un campo de descrición co mesmo nome." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1174 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1177 msgid "" "Progress measurements that are reported by quality forms can not be removed" msgstr "" @@ -4355,26 +4426,21 @@ msgstr "" msgid "Current value" msgstr "Valor actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:165 -msgid "Edit Quality Form" -msgstr "Editar formulario de calidade" - #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:823 msgid "Duplicate progress assignment for task " msgstr "Asignación de progreso duplicada para a tarefa" -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:48 -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:54 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:84 +#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:46 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:94 msgid "Save and Continue" msgstr "Gardar e continuar" -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:46 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:50 msgid "Zoom level" msgstr "Nivel de zoom" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:28 -#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:166 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:29 +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:168 msgid "Quality form" msgstr "Formulario de calidade" @@ -4382,16 +4448,21 @@ msgstr "Formulario de calidade" msgid "Go!" msgstr "Ir!" -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:271 +#: libreplan-webapp/src/main/webapp/calendars/_list.zul:30 +msgid "Inherits up to date" +msgstr "Herda ata a data" + +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:280 msgid "The name of the label is empty." msgstr "O nome da etiqueta está baleiro." -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:26 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:27 msgid "Profile data" msgstr "Datos do perfil" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:31 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:35 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:248 msgid "Configuration" msgstr "Configuración" @@ -4399,29 +4470,42 @@ msgstr "Configuración" msgid "It was not possible load entity. Not found. Id: " msgstr "Non foi posible cargar a entidade. Non atopada. Id: " -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:569 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:496 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:528 +msgid "This date can not be empty" +msgstr "A data non pode ser baleira" + +#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:22 +msgid "LibrePlan: Workers" +msgstr "LibrePlan: Traballadores" + +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:572 msgid "Create Virtual Workers Group" msgstr "Crear grupo de traballadores virtuais" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:933 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:861 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:678 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:911 msgid "Hours invested" msgstr "Horas invertidas" -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:160 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:324 +msgid "Authorization" +msgstr "Autorización" + +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:119 msgid "" "The name is not valid, there is another progress type with the same name. " msgstr "O nome non é válido, xa hai outro tipo de progreso co mesmo nome. " -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:740 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318 msgid "Project saved" msgstr "Proxecto gardado" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:45 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:44 msgid "task :" msgstr "tarefa :" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:712 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:715 msgid "ALL" msgstr "TODOS" @@ -4429,11 +4513,11 @@ msgstr "TODOS" msgid "criterion satisfaction's resource not specified" msgstr "recurso do criterio satisfeito non especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:596 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:68 msgid "Derived exception" msgstr "Excepción derivada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:291 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:292 msgid "Machines" msgstr "Máquinas" @@ -4441,10 +4525,6 @@ msgstr "Máquinas" msgid "Unit Measures List" msgstr "Lista de unidades de medida" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:222 -msgid "Confirm deleting this profile. Are you sure?" -msgstr "Confirmar o borrado deste perfil. ¿Está seguro?" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:153 msgid "Couldn't find element: {0}" msgstr "Non se puido atopar o elemento: {0}" @@ -4458,27 +4538,27 @@ msgstr "Debe seleccionar un escenario de destino" msgid "unit type code not found" msgstr "código de tipo de unidade non atopado" -#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:180 -msgid "Calendar Exception Type saved" -msgstr "Tipo de excepción de calendario gardado" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342 +msgid "My account" +msgstr "A miña conta" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:42 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:41 msgid "Resource :" msgstr "Recurso :" -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:40 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:39 msgid "Destination scenario" msgstr "Escenario de destino" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:153 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:105 msgid "Company view" msgstr "Vista da compañía" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:18 -msgid "LibrePlan: Configuration" -msgstr "LibrePlan: Configuración" +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:114 +msgid "Both" +msgstr "Ambos" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:751 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:758 msgid "Not editable for containing more that an hours group." msgstr "Non editable por conter máis dun grupo de horas." @@ -4486,43 +4566,43 @@ msgstr "Non editable por conter máis dun grupo de horas." msgid "Filter by" msgstr "Filtrar por" -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:45 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:76 +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:46 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:80 msgid "Limiting resource" msgstr "Recurso limitante" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/calendar/CalendarAllocationCommand.java:58 -#: libreplan-webapp/src/main/webapp/planner/order.zul:147 +#: libreplan-webapp/src/main/webapp/planner/order.zul:146 msgid "Calendar allocation" msgstr "Asignación de calendario" +#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:48 +msgid "Up to date" +msgstr "Actualizado" + #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:819 msgid "Duplicate value true report global progress for task" msgstr "" "Valor verdadeiro duplicado para a propiedade 'notificar progreso global' na " "tarefa" -#: libreplan-webapp/src/main/webapp/materials/materials.zul:85 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:84 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:32 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:120 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33 msgid "Category" msgstr "Categoría" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:154 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:156 msgid "must be greater than finish date" msgstr "debe ser maior que a data de fin" -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 -msgid "LibrePlan: Materials Needs At Date" -msgstr "LibrePlan: Necesidades de materiais en data" - #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:79 -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:202 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:203 msgid "[generic all workers]" msgstr "[xenérico todos os traballadores]" -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:26 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:27 msgid "Category data" msgstr "Datos de categoría" @@ -4530,18 +4610,30 @@ msgstr "Datos de categoría" msgid "Search" msgstr "Buscar" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:126 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:242 +msgid "Valid until" +msgstr "Válido ata" + +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:128 msgid "Add New Complementary Field" msgstr "Engadir novo campo complementario" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:229 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:232 msgid "Work weeks list" msgstr "Lista de semanas de traballo" -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:39 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:38 msgid "Source scenario" msgstr "Escenario de origen" +#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:24 +msgid "LibrePlan: Criteria" +msgstr "LibrePlan: Criterios" + +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:23 +msgid "LibrePlan: Transfer Projects Between Scenarios" +msgstr "LibrePlan: Transferir proxectos entre escenarios" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:118 msgid "%" msgstr "%" @@ -4551,25 +4643,27 @@ msgstr "%" msgid "Remove calendar" msgstr "Borrar calendario" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1548 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1712 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:512 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:648 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1346 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:656 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:228 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:312 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:256 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:139 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1536 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1700 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:425 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:651 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1323 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:669 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:254 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:337 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:259 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:141 msgid "must be lower than finish date" msgstr "debe ser anterior á data de fin" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:757 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:29 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:161 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:766 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:158 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:70 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:135 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:79 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:81 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33 msgid "Resource" msgstr "Recurso" @@ -4582,16 +4676,16 @@ msgstr "Total de horas de tarefa" msgid "Date last progress reported" msgstr "Data último progreso notificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/RedirectorSynthetiser.java:123 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/RedirectorSynthetiser.java:125 msgid "Could not load any resource" msgstr "Non se puido cargar un recurso" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:334 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:335 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:37 msgid "Work And Progress Per Project" msgstr "Traballo e progreso por proxecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:383 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:386 msgid "" "You must allow multiple active criteria for this type to use this assignment " "strategy" @@ -4607,26 +4701,26 @@ msgstr "sub elementos" msgid "Default Label" msgstr "Etiqueta por defecto" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:188 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:187 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:85 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:108 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:113 msgid "Close" msgstr "Pechar" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:471 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:945 msgid "Specific Allocations" msgstr "Asignacións específicas" -#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:271 +#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:225 #: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java:119 msgid "error doing reassignation: {0}" msgstr "Erro realizando reasignación: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:349 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:423 msgid "Time filter" msgstr "Filtrado de tempo" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:61 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:63 msgid "Move selected task up" msgstr "Mover tarefa seleccionada cara arriba" @@ -4635,44 +4729,32 @@ msgid "Select criteria set or specific resources for allocation" msgstr "" "Seleccione conxunto de criterios ou recursos específicos para asignación" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:316 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:348 msgid "Create copy" msgstr "Crear copia" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:34 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:33 msgid "Work Report Lines List" msgstr "Lista de liñas de parte de traballo" -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:27 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:28 msgid "Company data" msgstr "Datos da empresa" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:215 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:151 msgid "Unit type code cannot be empty" msgstr "O código de tipo de unidade non pode ser baleiro" -#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:47 -msgid "Average of the estimated hours" -msgstr "Media de horas estimadas" - -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:178 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:240 -msgid "Quality form saved" -msgstr "Formulario de calidade gardado" - -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:167 -msgid "Create Unit Type" -msgstr "Crear tipo de unidade" - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:184 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312 msgid "Users" msgstr "Usuarios" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:143 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:145 msgid "Label Type fields" msgstr "Campos de tipo de etiqueta" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:103 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:105 msgid "Hours Management" msgstr "Administración de horas" @@ -4680,7 +4762,7 @@ msgstr "Administración de horas" msgid "New task:" msgstr "Nova tarefa:" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:140 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:144 msgid "" "Please use some of the compatible browsers: Chrome, Firefox, Safari or " "Epiphany." @@ -4692,7 +4774,7 @@ msgstr "" msgid "specific allocation" msgstr "asignación específica" -#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:147 +#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:148 msgid "company name has to be unique. It is already used" msgstr "o nome da empresa debe ser único. Xa está a ser usado" @@ -4709,27 +4791,23 @@ msgstr "" msgid "Template saved" msgstr "Modelo gardado" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:305 -msgid "Confirm deleting this User. Are you sure?" -msgstr "Confirmar o borrado deste usuario. ¿Está seguro?" - -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:577 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:565 msgid "work report have not any description value with this field name" msgstr "" "o parte de traballo non ten ningún valor de descrición con ees valor de campo" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:179 -msgid "User saved" -msgstr "Usuario gardado" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:23 +msgid "LibrePlan: Configuration" +msgstr "LibrePlan: Configuración" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47 msgid "Task quality form name" msgstr "Nombre del formulario de calidad de tarea" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1097 -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:156 -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:161 -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:181 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1093 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:158 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:163 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:183 msgid "Some cost category assignments overlap in time" msgstr "Algunhas asignacións a categorías de custo solápanse no tempo" @@ -4757,45 +4835,41 @@ msgstr "Grupo" msgid "Statistics list " msgstr "Lista de estatísticas" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1116 +msgid "Please, enter a valid effort" +msgstr "Por favor, introduza un esforzo válido" + #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:28 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:59 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:61 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:62 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:56 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:65 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:58 msgid "Enabled" msgstr "Activado" -#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:143 -msgid "Edit Exception Day Type" -msgstr "Editar tipo de día de excepción" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:222 msgid "All resources must be limiting. " msgstr "Todos os recursos deben ser limitantes. " -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:327 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:525 msgid "Filter by worker" msgstr "Filtrar por traballadores" -#: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22 -msgid "LibrePlan: Machines" -msgstr "LibrePlan: Máquinas" - #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:47 msgid "Load due to current project" msgstr "Carga debido ao proxecto actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1344 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305 msgid "You are going to change the assignment function. Are you sure?" msgstr "Vai cambiar a función de asignación. ¿Está seguro?" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 msgid "Exception Days" msgstr "Días de excepción" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:200 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:183 msgid "There must be at least 2 stretches for doing interpolation" msgstr "Debe haber alo menos dous tramos para facer interpolación" @@ -4803,59 +4877,58 @@ msgstr "Debe haber alo menos dous tramos para facer interpolación" msgid "Incompatible update: stored resource is not of type: {0}" msgstr "Actualización incompatible: i recurso almacenado non é de tipo: {0}" -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:38 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:42 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:213 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:207 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:187 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:98 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:90 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:114 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:109 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:100 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:92 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:118 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:114 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:40 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:133 -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:39 -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:42 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:75 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:82 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:137 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:132 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:135 +#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:67 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:78 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:83 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:137 msgid "Save & Continue" msgstr "Gardar e continuar" +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21 +msgid "LibrePlan: Work And Progress Per Project" +msgstr "LibrePlan: Traballo e progreso por proxecto" + #: libreplan-webapp/src/main/webapp/orders/_edition.zul:90 msgid "Scheduling mode" msgstr "Modo de planificación" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:53 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:55 -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:50 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:54 +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29 -#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:34 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:23 msgid "Filter" msgstr "Filtrar" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:943 +msgid "Work Report Type" +msgstr "Tipo de parte de traballo" + #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:26 msgid "Assigned locations" msgstr "Ubicacións asignadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:247 -msgid "Unit type saved" -msgstr "Tipo de unidade gardado" - -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:267 -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:129 -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:138 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:270 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:131 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:140 msgid "Two hour costs with the same type overlap in time" msgstr "Dous custos por hora co mesmo tipo solápanse no tempo" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:201 -msgid "Create Machine" -msgstr "Crear máquina" - -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:64 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:66 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49 msgid "Report progress" msgstr "Notificar progreso" @@ -4864,7 +4937,7 @@ msgstr "Notificar progreso" msgid "ACWP" msgstr "ACWP" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:736 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:791 msgid "The periods available depend on the resource's calendar." msgstr "Os períodos dispoñibles dependen do calendario do recurso." @@ -4872,7 +4945,7 @@ msgstr "Os períodos dispoñibles dependen do calendario do recurso." msgid "START" msgstr "INICIO" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:313 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:342 msgid "Schedule from the deadline to start" msgstr "Planificar dende a data límite ao principio" @@ -4880,18 +4953,18 @@ msgstr "Planificar dende a data límite ao principio" msgid "generic machines allocation" msgstr "asignación xenérica de máquinas" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:372 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:375 msgid "Non limiting resource assignation" msgstr "Asignación de recursos non limitantes" #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:87 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75 -#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:82 +#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68 msgid "Back" msgstr "Atrás" #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:56 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:58 msgid "Subcontractor" msgstr "Subcontratista" @@ -4900,22 +4973,18 @@ msgstr "Subcontratista" msgid "Administration" msgstr "Administración" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1531 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1694 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:495 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:631 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1329 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:638 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:211 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:293 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:239 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1519 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1682 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:634 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1306 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:651 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:237 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:242 msgid "must be greater than start date" msgstr "debe ser maior que a data de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:93 -msgid "Create Company" -msgstr "Crear empresa" - #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:47 msgid "Cancel and return" msgstr "Cancelar e volver" @@ -4925,25 +4994,28 @@ msgstr "Cancelar e volver" msgid "Assign quality form" msgstr "Asignar formulario de calidade" -#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:222 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:387 msgid "Delete item {0}. Are you sure?" msgstr "Borrar elemento {0}. ¿Está seguro?" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:215 +msgid "Error setting up creationg form for Criterion Type with id}" +msgstr "" +"Erro preparando o formulario de edición para o tipo de criterio con id}" + #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:39 msgid "worked hours" msgstr "horas traballadas" -#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:50 +#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:51 msgid "Unit measure name" msgstr "Nome da unidade de medida" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:772 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:144 msgid "cannot include a progress of the same progress type twice" msgstr "non se pode asignar un progreso do mesmo tipo dúas veces" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:489 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:476 msgid "a work report line has not this label type assigned" msgstr "unha liña de parte de traballo non ten este tipo de etiqueta asignado" @@ -4952,35 +5024,34 @@ msgstr "unha liña de parte de traballo non ten este tipo de etiqueta asignado" msgid "Allocations" msgstr "Asignacións" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32 -#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:32 -msgid "Choosing Template" -msgstr "Selección de modelo" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52 msgid "Task code" msgstr "Código da tarefa" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:133 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:50 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:135 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:49 msgid "Length" msgstr "Lonxitude" #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:85 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:89 msgid "Capacity" msgstr "Capacidade" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:299 -#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:178 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:331 +#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:133 msgid "Create derived" msgstr "Crear derivado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:627 +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:302 +msgid "Label Types" +msgstr "Tipos de etiqueta" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:638 msgid "it must be greater than zero" msgstr "debe ser maior que cero" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:130 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:131 msgid "must be a real positive number" msgstr "debe ser un número real positivo" @@ -4993,35 +5064,34 @@ msgstr "Non se fixeron asignacións" msgid "Total hours task" msgstr "Total de horas de tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:409 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:441 msgid "Removed calendar \"{0}\"" msgstr "Borrado calendario \"{0}\"" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1083 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:23 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1063 msgid "Create project" msgstr "Crear proxecto" -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:49 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:542 +msgid "This date can not include the whole next work week" +msgstr "Esta data non pode incluír á próxima semana de traballo completa" + +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:51 msgid "" "Allow multiple values of this type of criterion in the same period of time" msgstr "" "Permitir múltiples valores deste tipo de criterio no mesmo período de tempo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1300 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1294 msgid "" "The date is not valid, the date must be unique for this progress assignment" msgstr "A data non é válida, debe ser única para esta asignación de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:113 -msgid "Edit Criterion Type" -msgstr "Editar tipo de criterio" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:445 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:453 msgid "The code cannot be empty." msgstr "O código non pode estar baleiro" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36 msgid "Human hours per machine working hour within configuration unit" msgstr "" "Horas humanas por hora de traballo de máquina dentro de unidade de " @@ -5040,12 +5110,16 @@ msgstr "" msgid "New work report" msgstr "Novo parte de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:668 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:862 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:865 msgid "yes" msgstr "si" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:886 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:304 +msgid "Root calendar" +msgstr "Calendario raíz" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:862 msgid "" "Deleting this subcontracted project, you are going to lose the relation to " "report progress. Are you sure?" @@ -5066,17 +5140,17 @@ msgstr "Data de fin" msgid "Validate" msgstr "Validar" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:143 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:175 msgid "This resource has already been added." msgstr "Este recurso xa fora engadido." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:129 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:149 msgid "Calendar exception types" msgstr "Tipos de excepcións de calendario" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33 -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:24 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:34 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:25 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:36 msgid "Cost category assignment" msgstr "Asignación de categoría de custo" @@ -5084,14 +5158,10 @@ msgstr "Asignación de categoría de custo" msgid "missing code in a hour cost" msgstr "falta código nun custo por hora" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:822 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:870 msgid "All workers" msgstr "Todos os traballadores" -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:304 -msgid "Label saved" -msgstr "Etiqueta gardada" - #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector_combo.zul:25 msgid "Select criteria or resources" msgstr "Seleccione criterios ou recursos" @@ -5102,58 +5172,57 @@ msgstr "Seleccione criterios ou recursos" msgid "Select required criteria set and press filter button" msgstr "Seleccione conxunto de criterios requeridos e pulse o botón de filtrar" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1018 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1279 +#: libreplan-webapp/src/main/java/org/libreplan/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:229 -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:231 -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:233 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:311 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:280 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:380 +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:121 +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:123 +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:207 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:307 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:115 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:147 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:740 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:135 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:168 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:738 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:134 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:63 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:128 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:47 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:44 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:72 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:49 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:42 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:48 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:44 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:50 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:84 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:88 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:93 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:33 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:42 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:53 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:43 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:54 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:43 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:53 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:42 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:44 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:58 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:129 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:48 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:46 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:74 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:50 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:43 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:50 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:45 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:53 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:89 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:94 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:92 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:94 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:34 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:54 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:44 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:55 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:61 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:54 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:43 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:46 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:37 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:44 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:45 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:39 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96 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/webapp/reports/schedulingProgressPerOrderReport.zul:21 -msgid "LibrePlan: Work And Progress Per Project" -msgstr "LibrePlan: Traballo e progreso por proxecto" - #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:43 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:52 msgid "New code" @@ -5163,25 +5232,21 @@ msgstr "Novo código" msgid "The progress type cannot be modified" msgstr "O tipo de progreso non pode ser modificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:412 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:392 msgid "Calculate Resources per Day" msgstr "Calcular recursos por día" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:996 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:904 msgid "The index fields and labels must be uniques and consecutives" msgstr "Os campos de índice e as etiquetas deben ser únicas e consecutivas" -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:21 -msgid "LibrePlan: Estimated/Planned Hours Per Task" -msgstr "LibrePlan: Horas estimadas/planificadas por tarefa" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:130 msgid "Estimate To Complete" msgstr "Estimación do custo pendente" -#: libreplan-webapp/src/main/webapp/materials/materials.zul:84 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:83 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:29 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 msgid "Unit type" msgstr "Tipo de unidade" @@ -5194,21 +5259,21 @@ msgstr "Carga debido a outras asignacións" msgid "Sum of all task leafs imputed hours" msgstr "Suma de horas imputadas por todas as tarefas folla" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:644 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:554 msgid "This machine was already removed by other user" msgstr "Esta máquina xa foi borrada por outro usuario" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:293 -msgid "Work Reports" -msgstr "Partes de traballo" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:256 +msgid "Host:" +msgstr "Host:" #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:26 msgid "Calendar data" msgstr "Datos do calendario" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:173 -msgid "login name is already being used by another user" -msgstr "o nome de usuario xa está sendo usado" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:294 +msgid "Work Reports" +msgstr "Partes de traballo" #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:22 msgid "Cost Categories List" @@ -5218,31 +5283,37 @@ msgstr "Lista de categorías de custo" msgid "code is already used" msgstr "o código xa está a ser usado" +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:67 +msgid "Labels list" +msgstr "Lista de etiquetas" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:284 +msgid "Password:" +msgstr "Contrasinal:" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:152 msgid "Criterion Requirements" msgstr "Criterios requiridos" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:148 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:185 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:212 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:66 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:188 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:215 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:76 msgid "Extra Effort" msgstr "Esforzo extra" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:57 -msgid "Move selected task down" -msgstr "Mover tarefa seleccionada cara abaixo" - -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:260 +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:269 msgid "Already exists other label with the same name" msgstr "Xa existe outra etiqueta co mesmo nome" +#: libreplan-webapp/src/main/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/OrderFilterEnum.java:32 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32 msgid "Customer Reference" msgstr "Referencia do cliente" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:777 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:134 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:147 msgid "spread values are not valid, at least one value should be true" @@ -5261,15 +5332,15 @@ msgstr "Optimista" msgid "SV" msgstr "SV" -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:83 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:85 msgid "Our company login" msgstr "Nome de usuario da nosa empresa" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1483 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1471 msgid "Filter work reports" msgstr "Filtrar partes de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:395 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:427 msgid "" "Default calendar cannot be removed. Please, change the default calendar in " "the Configuration window before." @@ -5277,10 +5348,10 @@ msgstr "" "O calendario por defecto non se pode borrar. Por favor, cambie antes o " "calendario por defecto na ventá de configuración." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:587 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:932 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:858 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:600 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:677 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:908 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:46 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:49 #: libreplan-webapp/src/main/webapp/templates/templates.zul:63 @@ -5288,7 +5359,7 @@ msgstr "" msgid "Progress" msgstr "Progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:128 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:259 msgid "" "This criterion type cannot be deleted because it has assignments to projects " "or resources" @@ -5296,31 +5367,27 @@ msgstr "" "Este tipo de criterio non se pode borrar porque ten asignacións a proxectos " "ou recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1221 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1224 msgid "All progress types have already been assigned." msgstr "Xa se asignaron todos os tipos de progreso." -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80 msgid "Price per hour" msgstr "Prezo por hora" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:209 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:211 msgid "Project: {0} " msgstr "Proxecto: {0} " -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:314 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:315 msgid "Calendars" msgstr "Calendarios" -#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:21 -msgid "LibrePlan: Page not found" -msgstr "LibrePlan: Páxina non atopada" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:355 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:360 msgid "The date cannot be null" msgstr "A data non pode ser nula" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:316 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:317 msgid "" "Another task in the same branch is already reporting progress for this " "quality form" @@ -5328,6 +5395,10 @@ msgstr "" "Outra tarefa na mesma rama xa está informando dun progreso para este " "formulario de calidade" +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:30 +msgid "options" +msgstr "opcións" + #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92 msgid "Latest date" msgstr "Data máis tardía" @@ -5336,13 +5407,18 @@ msgstr "Data máis tardía" msgid "Show only current satisfied criteria" msgstr "Mostrar só os criterios satisfeitos actualmente" -#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:231 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:23 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:23 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:23 +msgid "LibrePlan: Work Reports" +msgstr "LibrePlan: Partes de traballo" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:393 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:373 msgid "Error on showing delete confirm" msgstr "Erro ao mostrar a confirmación de borrado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:671 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:623 msgid "Sum of all rows" msgstr "Suma de todas as filas" @@ -5358,15 +5434,7 @@ msgstr "Hora de fin" msgid "Done {0} of {1}" msgstr "Feito {0} de {1}" -#: libreplan-webapp/src/main/webapp/users/users.zul:23 -msgid "LibrePlan: Accounts" -msgstr "LibrePlan: Contas" - -#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:23 -msgid "LibrePlan: Scenarios Management" -msgstr "LibrePlan: Xestión de escenarios" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:194 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:177 msgid "" "Last stretch should have one hundred percent for length and amount of work " "percentage" @@ -5374,12 +5442,12 @@ msgstr "" "O último tramo debe ter 100% de porcentaxes de lonxitude e cantidade de " "traballo" -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:79 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:100 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:71 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:60 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:75 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:60 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:96 msgid "Filter by projects" msgstr "Filtrar por proxectos" @@ -5387,17 +5455,17 @@ msgstr "Filtrar por proxectos" msgid "Criteria of selected type " msgstr "Criterios do tipo seleccionado " -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:33 msgid "Each worker configuration unit name" msgstr "Nome da unidade de configuración de cada traballador" #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43 -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:42 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:224 +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:44 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:221 msgid "Active" msgstr "Activo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1258 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1261 msgid "This progress measurement can not be in " msgstr "Esta medida de progreso non pode estar en " @@ -5405,7 +5473,7 @@ msgstr "Esta medida de progreso non pode estar en " msgid "Inherited labels" msgstr "Etiquetas herdadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1243 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1246 msgid "" "This progress can not be changed or removed, because it has got consolidated " "progress. It is needed to remove the consolidation on all its progress." @@ -5415,12 +5483,12 @@ msgstr "" "progreso." #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:910 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:917 msgid "Unindent" msgstr "Desindentar" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:932 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1390 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:935 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1384 msgid "Value is not valid, the current value must be not empty" msgstr "O valor non é válido, o valor actual non debe estar baleiro" @@ -5428,7 +5496,11 @@ msgstr "O valor non é válido, o valor actual non debe estar baleiro" msgid "Direct labels" msgstr "Etiquetas directas" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:92 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:43 +msgid "From today" +msgstr "A partir de hoxe" + +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:96 msgid "Log in" msgstr "Entrar" @@ -5436,15 +5508,15 @@ msgstr "Entrar" msgid "Project name" msgstr "Nome do proxecto" -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:53 +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:55 msgid "Precision" msgstr "Precisión" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:372 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:359 msgid "missing code in a work report line" msgstr "falta código nunha liña de parte de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:985 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:928 msgid "Efforts" msgstr "Esforzos" @@ -5452,32 +5524,30 @@ msgstr "Esforzos" msgid "Show all reported hours" msgstr "Mostrar todas as horas notificadas" -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:22 -msgid "LibrePlan: Subcontracted Tasks" -msgstr "LibrePlan: Tarefas subcontratadas" - +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:102 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:113 msgid "Projects List" msgstr "Listado de proxectos" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:137 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:58 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:65 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:49 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:74 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:51 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:52 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:136 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:60 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:50 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:76 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:52 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:56 #: libreplan-webapp/src/main/webapp/materials/materials.zul:60 -#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:44 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:45 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:45 +#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:45 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:44 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:46 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:46 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:80 msgid "Generate code" msgstr "Xerar código" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:110 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:116 msgid "Scheduling state" msgstr "Estado de planificación" @@ -5489,19 +5559,27 @@ msgstr "Este modelo non pode borrarse porque ten aplicacións." msgid "The code sequence is already in use and it can not be updated." msgstr "O código da secuencia xa está en uso e non se pode actualizar." -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21 -msgid "LibrePlan: Project Costs Per Resource" -msgstr "LibrePlan: Custos de proxectos por recurso" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:332 +msgid "Import LDAP roles" +msgstr "Importar roles do LDAP" + +#: libreplan-webapp/src/main/webapp/settings/settings.zul:43 +msgid "Personal Data" +msgstr "Datos persoais" #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java:206 msgid "criterion satisfaction's criterion not specified" msgstr "criterio do criterio satisfeito non especificado" +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:21 +msgid "LibrePlan: Hours Worked Per Resource" +msgstr "LibrePlan: Horas traballadas por recurso" + #: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:163 msgid "Number of iterations should be between 1 and " msgstr "O número de iteracións debe estar entre 1 e " -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:126 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:142 msgid "Scenarios must be enabled as more elements than master exist" msgstr "" "Os escenarios deben estar habilitados xa que existen máis elementos que " @@ -5521,11 +5599,11 @@ msgstr "Tarefa {0} : O grupo de tarefas ten un tipo incompatible con {1}" msgid "Profiles authorization" msgstr "Autorización de perfís" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:292 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:293 msgid "Virtual Workers Groups" msgstr "Grupos de traballadores virtuais" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:144 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:95 msgid "Planning charts expanded" msgstr "Gráficas de planificación expandidas" @@ -5533,7 +5611,11 @@ msgstr "Gráficas de planificación expandidas" msgid "Assignation" msgstr "Asignación" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:431 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:694 +msgid "Inh" +msgstr "Her" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:339 msgid "Not deletable" msgstr "Imborrable" @@ -5549,7 +5631,7 @@ msgstr "código non especificado" msgid "Projects list" msgstr "Lista de proxectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:190 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:973 msgid "" "Cannot delete work report type. There are some work reports bound to it." msgstr "" @@ -5560,41 +5642,40 @@ msgstr "" msgid "Criterion Type List" msgstr "Lista de tipos de criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:732 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:702 msgid "Overall progress" msgstr "Progreso global" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:52 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:54 msgid "Create template from selected task" msgstr "Crear modelo a partir de tarefa seleccionada" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:119 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:129 msgid "All projects" msgstr "Todos os proxectos" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:47 -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:79 +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:41 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:60 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:83 msgid "Password" msgstr "Contrasinal" #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:36 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:89 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:93 msgid "Observations" msgstr "Observacións" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:962 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:942 msgid "Edit project" msgstr "Editar proxecto" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:24 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:25 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:27 msgid "Progress assignments" msgstr "Asignación de progreso" -#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:27 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:244 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:263 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:285 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:240 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:262 msgid "Valid from" msgstr "Válido desde" @@ -5606,24 +5687,24 @@ msgstr "a data de excepción xa existe" msgid "There exists other template with the same name." msgstr "Xa existe outro modelo co mesmo nome." -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:59 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:53 msgid "Month" msgstr "Mes" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:900 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:911 msgid "{0} could not be allocated. Cannot allocate more than one resource" msgstr "Non se puido asignar {0}. Non se pode asignar máis que un recurso" -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:56 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:58 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32 msgid "Color" msgstr "Cor" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:759 -msgid "Advanced assignment saved" -msgstr "Asignación avanzada gardada" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:105 +msgid "Current password is incorrect" +msgstr "O contrasinal actual é incorrecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:366 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:367 msgid "Cannot insert material in general view. Please, select a category" msgstr "" "Non se pode insertar material na vista xeral. Por favor, seleccione unha " @@ -5633,36 +5714,44 @@ msgstr "" msgid "criterion satisfaction's start date not specified" msgstr "data de inicio do criterio satisfeito non especificada" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:371 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:405 msgid "Only {0} resources per day were achieved for current allocation" msgstr "Só se lograon {0} recursos por día para a asignación actual" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:311 +msgid "Delete {0} \"{1}\". Are you sure?" +msgstr "Borrar {0} \"{1}\". ¿Está seguro?" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:270 +msgid "Base:" +msgstr "Base:" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:51 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:133 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:79 -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:97 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:86 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:98 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:48 -#: libreplan-webapp/src/main/webapp/planner/order.zul:69 -#: libreplan-webapp/src/main/webapp/planner/order.zul:132 -#: libreplan-webapp/src/main/webapp/planner/order.zul:167 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:83 -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:39 -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:43 +#: libreplan-webapp/src/main/webapp/planner/order.zul:70 +#: libreplan-webapp/src/main/webapp/planner/order.zul:131 +#: libreplan-webapp/src/main/webapp/planner/order.zul:166 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:89 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:79 #: libreplan-webapp/src/main/webapp/planner/main.zul:66 msgid "Accept" msgstr "Aceptar" -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:79 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:81 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:259 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:266 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:273 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:280 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:308 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:339 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:346 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:353 msgid "Example: {0}" msgstr "Exemplo: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:283 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:303 -#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:40 -msgid "Edit Worker" -msgstr "Editar traballador" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:458 msgid "" "Create new material assignment out of material assignment {0}. Are you sure?" @@ -5670,7 +5759,7 @@ msgstr "" "Crear nova asignación de material fóra da asignación de material {0}. ¿Está " "seguro?" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:193 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:190 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:167 msgid "Work report lines" msgstr "Liñas do parte de traballo" @@ -5679,16 +5768,16 @@ msgstr "Liñas do parte de traballo" msgid "Calculated" msgstr "Calculado" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:211 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:213 msgid "Completed: {0}% " msgstr "Completado: {0}% " -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:118 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:229 msgid "Error setting up edition form for Criterion Type with id: {0}" msgstr "" "Erro preparando o formulario de edición para o tipo de criterio con id: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1178 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1181 msgid "Calculated progress measurement can not be removed" msgstr "As medidas de progreso calculadas non se poden borrar" @@ -5697,22 +5786,22 @@ msgstr "As medidas de progreso calculadas non se poden borrar" msgid " The " msgstr " O " -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:51 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:55 msgid "Access to the system" msgstr "Acceso ao sistema" -#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:61 +#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:48 msgid "Probability" msgstr "Probabilidade" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:104 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:203 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:183 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:190 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:86 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:207 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:218 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:156 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:178 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:186 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:159 msgid "Click on " msgstr "Click en" @@ -5721,6 +5810,10 @@ msgstr "Click en" msgid "Report data" msgstr "Datos do informe" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:305 +msgid "UserId:" +msgstr "UserId:" + #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:44 msgid "External load" msgstr "Carga externa" @@ -5729,6 +5822,10 @@ msgstr "Carga externa" msgid "Progress sent successfully" msgstr "O progreso enviouse con éxito" +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:113 +msgid "Order elements" +msgstr "Elementos de pedido" + #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/InstanceNotFoundRecoverableErrorException.java:46 msgid "instance not found" msgstr "instancia non atopada" @@ -5737,16 +5834,20 @@ msgstr "instancia non atopada" msgid "Priority" msgstr "Prioridade" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:207 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:70 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:219 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:80 msgid "Infinitely Over Assignable" msgstr "Sobreasignable infinitamente" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:425 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47 +msgid "Apply changes and continue edition" +msgstr "Aplicar cambios e continuar a edición" + +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:426 msgid "criterion names must be unique inside a criterion type" msgstr "o nome do criterio debe ser único dentro dun tipo de criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:735 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:790 msgid "" "The periods available depend on the satisfaction of the criteria by the " "resources and their calendars." @@ -5754,52 +5855,53 @@ msgstr "" "Os períodos dispoñibles dependen da satisfacción dos criterios polos " "recursos e os seus calendarios." -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:814 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:824 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:79 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:85 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:65 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:132 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:52 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:59 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:186 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:287 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:44 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:131 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:54 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:54 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:189 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:264 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:45 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:37 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:26 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:69 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:71 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:38 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:46 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:47 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:27 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:47 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:76 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:49 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:79 #: libreplan-webapp/src/main/webapp/materials/materials.zul:59 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:81 -#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:36 -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66 -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:76 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:49 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:37 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:80 +#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:37 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:65 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:75 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:51 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:38 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:39 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:39 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:76 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:40 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:40 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:40 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:41 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:26 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:114 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 #: libreplan-webapp/src/main/webapp/orders/_list.zul:29 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:76 #: libreplan-webapp/src/main/webapp/templates/templates.zul:85 #: libreplan-webapp/src/main/webapp/templates/_list.zul:26 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:90 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:95 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:99 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:120 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:86 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:91 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:95 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:116 msgid "Code" msgstr "Código" -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:41 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:40 msgid "Add stretch" msgstr "Engadir tramo" @@ -5811,7 +5913,7 @@ msgstr "Mostrar asignacións de recursos" msgid "Assignation type" msgstr "Tipo de asignación" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:387 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:367 msgid "Calculate Workable Days" msgstr "Calcular días laborais" @@ -5823,16 +5925,16 @@ msgstr "" "A data de inicio non é válida, a data de inicio nova debe ser anterior á " "data de fin" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 -#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:55 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:96 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:57 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:100 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:121 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 +#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:42 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:92 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:53 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:96 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:117 msgid "Start date" msgstr "Data de inicio" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:168 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:171 msgid "Update exception" msgstr "Actualizar excepción" @@ -5845,8 +5947,7 @@ msgstr "Non se pode realizar a operación" msgid "Budget" msgstr "Presuposto" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:65 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "May" msgstr "Maio" @@ -5854,7 +5955,7 @@ msgstr "Maio" msgid "Already exists other criterion with the same name" msgstr "Xa existe outro criterio co mesmo nome" -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:37 +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:38 msgid "Unit name" msgstr "Nome da unidade" @@ -5863,10 +5964,6 @@ msgstr "Nome da unidade" msgid "Write" msgstr "Escribir" -#: libreplan-webapp/src/main/webapp/labels/labelTypes.zul:21 -msgid "LibrePlan: Labels" -msgstr "LibrePlan: Etiquetas" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderBandboxFinder.java:44 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 @@ -5875,7 +5972,7 @@ msgstr "LibrePlan: Etiquetas" msgid "Project code" msgstr "Código de proxecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:499 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:503 msgid "Assign element to queue automatically" msgstr "Asignar elemento á cola automáticamente" @@ -5891,32 +5988,27 @@ msgstr "" "Data despois da cal a tarefa debe empezar (presione enter no cadro de texto " "para abrir o calendario ou escriba a data directamente)" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:326 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:603 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:596 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:43 msgid "Normal" msgstr "Normal" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:317 msgid "Date cannot be null" msgstr "A data non pode ser nula" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:765 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:169 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:108 +msgid "Project view" +msgstr "Vista de proxecto" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:774 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:166 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:76 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:142 msgid "Task Code" msgstr "Código da tarefa" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:157 -msgid "Project view" -msgstr "Vista de proxecto" - -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:96 -msgid "Create Profile" -msgstr "Crear perfil" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:747 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:655 msgid "This label type already is assigned to the work report type." msgstr "Este tipo de etiqueta xa está asignado ao tipo de parte de traballo." @@ -5931,50 +6023,48 @@ msgstr "Probabilidade %" msgid "New criterion" msgstr "Criterio novo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:730 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:346 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:542 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:700 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:325 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:813 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49 msgid "Load" msgstr "Carga" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:937 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:60 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:682 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:62 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:65 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:82 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:47 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:67 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:81 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:49 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:41 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:43 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:59 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:120 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:101 #: libreplan-webapp/src/main/webapp/templates/_list.zul:32 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 msgid "Description" msgstr "Descrición" -#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:24 -msgid "LibrePlan: Criteria" -msgstr "LibrePlan: Criterios" +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:39 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:45 +msgid "Apply" +msgstr "Aplicar" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:117 -msgid "Go to advanced Allocation" -msgstr "Ir a asignación avanzada" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:660 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:671 msgid "already exists an allocation for criteria {0}" msgstr "xa existe unha asignación para os criterios {0}" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:283 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:287 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288 msgid "Project Templates" msgstr "Modelos de proxectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339 msgid "Forward" msgstr "Adiante" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:465 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:469 msgid "Invalid queue element" msgstr "Elemento de cola inválido" @@ -5988,21 +6078,22 @@ msgstr "Número de aplicacións finalizadas" msgid "Unnasigned" msgstr "Non asignado" -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:61 -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:70 -#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:163 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:179 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:74 +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:165 msgid "User" msgstr "Usuario" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405 msgid "At least one HoursGroup is needed" msgstr "É necesario alo menos un HoursGroup" -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:69 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:71 msgid "Interacts with applications" msgstr "Interactúa con aplicacións" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:257 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:289 msgid "Virtual worker" msgstr "Traballador virtual" @@ -6010,7 +6101,7 @@ msgstr "Traballador virtual" msgid "Length percentage should be between 0 and 100" msgstr "A porcentaxe de duración debería estar entre 0 e 100" -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:48 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:50 msgid "Multiple values per resource" msgstr "Múltiples valores por recurso" @@ -6023,13 +6114,13 @@ msgstr "Horas:" msgid "Split" msgstr "Dividir" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:101 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:100 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:106 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:105 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:107 msgid "please, select a project" msgstr "por favor, seleccione un proxecto" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:118 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:122 msgid "Supported Chrome, Firefox, Safari and Epiphany browsers" msgstr "Compatible cos navegadores Chrome, Firefox, Safari e Epiphany" @@ -6039,14 +6130,14 @@ msgstr "Compatible cos navegadores Chrome, Firefox, Safari e Epiphany" #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:45 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:50 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:56 #: libreplan-webapp/src/main/webapp/orders/_list.zul:30 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:94 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:51 msgid "Starting date" msgstr "Data de inicio" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:64 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:63 msgid "Add materials" msgstr "Engadir materiais" @@ -6054,66 +6145,61 @@ msgstr "Engadir materiais" msgid "Load 100%" msgstr "Carga 100%" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:991 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:934 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:84 msgid "Function" msgstr "Función" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:775 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:394 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:745 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:364 msgid "date in future" msgstr "data no futuro" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:654 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:630 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:851 msgid "New project version" msgstr "Nova versión de proxecto" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:82 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:183 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:198 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:161 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:139 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:160 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:168 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:141 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:187 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:194 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:135 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:156 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:164 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:137 msgid "Format" msgstr "Formato" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:174 -msgid "Edit Unit Type" -msgstr "Editar tipo de unidade" - -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:332 -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:474 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1249 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:472 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:364 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1226 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:483 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:77 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:532 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:537 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:78 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:37 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:104 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:33 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:40 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:27 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:28 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:42 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:44 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:37 -#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:24 +#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:25 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:47 -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:25 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:25 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:49 +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:26 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:26 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:42 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:37 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:35 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:39 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:41 #: libreplan-webapp/src/main/webapp/templates/_list.zul:48 msgid "Edit" msgstr "Editar" -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81 msgid "Init date" msgstr "Data de inicio" @@ -6121,7 +6207,15 @@ msgstr "Data de inicio" msgid "Responsible" msgstr "Responsable" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:457 +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:60 +msgid "New password" +msgstr "Novo contrasinal" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:263 +msgid "Port:" +msgstr "Porto:" + +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:352 msgid "percentage must be in range (0,100]" msgstr "a porcentaxe debe estar no rango (0,100]" @@ -6130,7 +6224,7 @@ msgstr "a porcentaxe debe estar no rango (0,100]" msgid "New Description" msgstr "Nova descrición" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1154 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1150 msgid "" "resources cost category assignment codes must be unique inside a resource" msgstr "" @@ -6151,22 +6245,23 @@ msgstr "" "criterionSatisfaction co mesmo criterionType" #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/ResourceEnumConverter.java:61 +#: libreplan-webapp/src/main/java/org/libreplan/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java:85 msgid "Unable to convert {0} value to {1} type" msgstr "Non se puido convertir o valor {0} ao tipo {1}" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:198 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:114 msgid "Tree {0} sucessfully flattened" msgstr "Árobre {0} aplanada satisfatoriamente" -#: libreplan-webapp/src/main/webapp/materials/materials.zul:83 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:82 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:30 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:119 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 msgid "Unit price" msgstr "Prezo da unidade" #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:72 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:68 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 msgid "Project Code" msgstr "Código do proxecto" @@ -6178,16 +6273,11 @@ msgstr "Data de comunicación" msgid "Reassigning" msgstr "Reasignando" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:588 -msgid "" -"Cannot delete that cost category because there are resources assigned to it." -msgstr "" -"Non se pode borrara categoría de custo porque hai recursos asignados a ela." - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:633 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:644 msgid "{0} already assigned to resource allocation list" msgstr "{0} xa está na lista de asignación de recursos" +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:184 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:27 msgid "Unit Measure" msgstr "Unidade de medida" @@ -6203,14 +6293,13 @@ msgstr "Lista de tipos de etiqueta" #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:42 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:64 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:128 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:46 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:98 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:232 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:127 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:47 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:101 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:27 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:42 -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:59 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:77 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:44 +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:61 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42 @@ -6220,25 +6309,25 @@ msgstr "Lista de tipos de etiqueta" #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:36 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:33 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:119 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:161 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:137 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:178 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:140 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:99 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:140 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:107 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:148 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:83 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:123 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:165 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:133 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:174 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:95 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:95 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:136 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:103 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:144 msgid "Type" msgstr "Tipo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:346 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:347 msgid "{0} projects reassignation remaining" msgstr "quedan {0} proxectos por reasignar" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:637 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:542 msgid "" "This machine cannot be deleted because it has assignments to projects or " "imputed hours" @@ -6246,13 +6335,16 @@ msgstr "" "Esta máquina non se pode borrar porque ten asignacións a proxectos ou horas " "imputadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:71 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45 msgid "November" msgstr "Novembro" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1288 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1310 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:89 +msgid "Enable/Disable" +msgstr "Habilitar/Deshabilitar" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1282 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1304 msgid "" "Value is not valid, the value must be greater than the value of the previous " "progress." @@ -6267,58 +6359,56 @@ msgstr "BCWS" msgid " in the specified directory." msgstr " no directorio especificado." -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1148 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1144 msgid "criterion satisfaction codes must be unique inside a resource" msgstr "o código do criterio debe ser único dentro dun recurso" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:668 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:862 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:865 msgid "no" msgstr "non" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:360 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:347 msgid "missing code in a work report." msgstr "falta código nun parte de traballo." #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnum.java:29 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:29 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementFilterEnum.java:36 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:85 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:105 msgid "Criterion" msgstr "Criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:94 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:103 msgid "unl" msgstr "ili" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:76 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:290 +msgid "Test LDAP connection" +msgstr "Probar a conexión co LDAP" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:96 msgid "Generate code for" msgstr "Xerar código para" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:397 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:481 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:384 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:468 #: libreplan-webapp/src/main/java/org/libreplan/ws/labels/impl/LabelConverter.java:103 msgid "missing code in a label" msgstr "falta o código nunha etiqueta" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:139 -msgid "is not supported for its use with LibrePlan." -msgstr "no está soportado para o seu uso con LibrePlan." - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:123 msgid "Actual Cost Work Performed" msgstr "Custo de traballo realizado" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:185 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:172 msgid "Create project from Template" msgstr "Crear proxecto a partir de modelo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310 -msgid "LibrePlan Configuration" -msgstr "LibrePlan: Configuración" - -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:406 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:417 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" @@ -6328,10 +6418,6 @@ msgstr "" " O código non pode conter caracteres como '_' \n" " e non debe ser baleiro" -#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:51 -msgid "Average of the worked hours" -msgstr "Media de horas traballadas" - #: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorization.java:43 msgid "an authorization type must be set" msgstr "Debe seleccionar un tipo de autorización" @@ -6340,8 +6426,7 @@ msgstr "Debe seleccionar un tipo de autorización" msgid "Must start after (days since beginning project)" msgstr "Debe empezar despois de (días desde o inicio do proxecto)" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:653 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:629 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:850 msgid "" "Confirm creating a new project version for this scenario and derived. Are " "you sure?" @@ -6349,58 +6434,62 @@ msgstr "" "Confirmar a creación dunha nova versión do proxecto para este escenario e os " "seus derivados. ¿Está seguro?" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:150 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:156 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:29 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:68 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:44 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:74 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:72 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:45 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:73 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:59 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:66 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:77 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:109 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:150 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:167 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:88 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:129 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:88 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:88 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:129 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:96 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:137 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:73 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:105 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:154 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:80 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:122 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:163 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:84 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:84 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:84 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:125 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:92 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:133 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:105 msgid "Add" msgstr "Engadir" -#: libreplan-webapp/src/main/webapp/materials/materials.zul:47 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:44 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:85 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:124 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:48 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:82 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:120 msgid "Unselect" msgstr "Deseleccionar" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:617 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:609 msgid "You should select the type of exception" msgstr "Debe seleccionar o tipo de excepción" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:93 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:56 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:62 #: libreplan-webapp/src/main/webapp/orders/_list.zul:31 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:99 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46 msgid "Deadline" msgstr "data límite" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:336 +msgid "Group path:" +msgstr "Path do grupo:" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 msgid "Subcontracted Tasks" msgstr "Tarefas subcontratadas" -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:122 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:118 msgid "Filter by categories or materials" msgstr "Filtrar por categorías ou materiais" @@ -6408,7 +6497,7 @@ msgstr "Filtrar por categorías ou materiais" msgid "Amount work percentage should be between 0 and 100" msgstr "A porcentaxe de cantidade de traballo debe estar entre 0 y 100" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:29 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:30 msgid "Machine data" msgstr "Datos da máquina" @@ -6416,19 +6505,18 @@ msgstr "Datos da máquina" msgid "VAC" msgstr "VAC" -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:28 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:29 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:34 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:55 msgid "Label type" msgstr "Tipo de etiqueta" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:246 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:319 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:243 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:156 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:236 msgid "Advanced Allocation" msgstr "Asignación avanzada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:309 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310 msgid "Administration / Management" msgstr "Administración / Xestión" @@ -6440,8 +6528,8 @@ msgstr "Número de iteracións" msgid "Template Tree" msgstr "Árbore de modelos" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:499 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:34 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:447 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 msgid "Alpha" msgstr "Alfa" @@ -6454,20 +6542,20 @@ msgstr "O criterio ten subelementos" msgid "inconsistent parent code." msgstr "código pai inconsistente." +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:430 +msgid "effort is not properly calculated based on clock" +msgstr "o esforzo non está ben calculado baseándose no reloxo" + #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:33 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:67 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:63 msgid "Status" msgstr "Estado" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:163 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:111 msgid "Resource load view" msgstr "Vista de carga de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:763 -msgid "the date must be inside the visualization area" -msgstr "a data debe estar dentro da área de visualización" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:806 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:816 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:70 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:82 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/EffortDurationPicker.java:62 @@ -6476,32 +6564,40 @@ msgstr "a data debe estar dentro da área de visualización" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:154 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:35 #: libreplan-webapp/src/main/webapp/orders/_list.zul:34 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:69 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:76 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:72 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:81 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:72 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:54 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:34 msgid "Hours" msgstr "Horas" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:54 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:733 +msgid "the date must be inside the visualization area" +msgstr "a data debe estar dentro da área de visualización" + +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:56 msgid "Quality form type" msgstr "Tipo de formulario de calidade" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:405 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:392 msgid "work report has not this label type assigned" msgstr "o parte de traballo non ten este tipo de etiqueta asignado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1230 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1192 msgid "Limiting assignment" msgstr "Asignación limitante" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:522 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:523 msgid "date not specified." msgstr "data non especificada." -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:360 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:318 +msgid "{0} \"{1}\" deleted" +msgstr "{0} \"{1}\" borrado" + +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:364 msgid " hours" msgstr " horas" @@ -6509,43 +6605,40 @@ msgstr " horas" msgid "The name of the criterion is empty." msgstr "O nome do criterio está baleiro." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:281 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:134 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:147 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:132 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:145 msgid "Limiting Resources Planning" msgstr "Planificación de recursos limitantes" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:770 -msgid "The max value must be not empty" -msgstr "O valor máximo non pode ser baleiro" - -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:66 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:69 msgid "New label" msgstr "Nova etiqueta" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:134 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:137 msgid "Worker ID cannot be empty" msgstr "NIF do traballador non especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:177 -msgid "All project tasks" -msgstr "Todas as tarefas do proxecto" - #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:343 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:352 msgid "The start date cannot be null" msgstr "A data de inicio non pode ser nula" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:31 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:188 +msgid "All project tasks" +msgstr "Todas as tarefas do proxecto" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:367 +msgid "LDAP Roles (separated by ;)" +msgstr "Roles do LDAP (separados por ;)" + #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:78 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:27 msgid "Allocation configuration" msgstr "Configuración de asignación" -#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:125 -msgid "Scenario \"{0}\" saved" -msgstr "Escenario \"{0}\" gardado" - -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:215 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:209 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:189 msgid "Save & New work report" msgstr "Gardar e novo parte de traballo" @@ -6554,39 +6647,39 @@ msgstr "Gardar e novo parte de traballo" msgid "Subcontract price" msgstr "Prezo de subcontratación" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:744 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:799 msgid "Resources per day are zero" msgstr "Hai cero recursos por día" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:30 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:31 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32 msgid "Assigned criteria" msgstr "Criterios asignados" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:53 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:57 msgid "Help on authentication (opens a new window)" msgstr "Axuda sobre a identificación (abre unha ventana nova)" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:870 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:778 msgid "The length must be greater than 0, and not null." msgstr "A lonxitude debe ser maior que cero e non nula." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:39 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:54 msgid "Not a valid effort duration" msgstr "Non é unha duración de esforzo válida" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:544 +#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:199 +msgid "Cannot remove the predefined Exception Day Type \"{0}\"" +msgstr "Non se pode borrar o tipo de día de excepción predefinido \"{0}\"" + +#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:34 +msgid "Base calendar type" +msgstr "Tipo de calendario base" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:613 msgid "Could not save new calendar" msgstr "Non se puido gardar o calendario novo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1467 -msgid "Sigmoid function applied to current resource" -msgstr "Función sigmoide aplicada ao recurso actual" - -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:160 -msgid "Deleted unit type {0}" -msgstr "Borrado tipo de unidade {0}" - #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:224 msgid "Could not save the scenario" msgstr "Non se puido gardar o escenario" @@ -6595,43 +6688,40 @@ msgstr "Non se puido gardar o escenario" msgid "Couldn't find criterion {0}" msgstr "Non se puido atopar o criterio {0}" -#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:37 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:36 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:33 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:35 msgid "Apply filtering to tasks satisfying required criteria" msgstr "Aplicar filtrado ás tarefas que satisfán os criterios requeridos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:37 msgid "Task Scheduling Status In Project" msgstr "Estado de planificación de tarefas en proxecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:200 -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:421 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:345 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:373 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:194 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:887 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:261 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:863 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:356 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313 msgid "Confirm" msgstr "Confirmar" #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:56 -#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:32 -#: libreplan-webapp/src/main/webapp/calendars/_list.zul:32 +#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:55 +#: libreplan-webapp/src/main/webapp/calendars/_list.zul:35 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:43 -#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:51 +#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:52 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:45 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:57 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:48 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:32 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:58 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:33 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:61 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:40 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:55 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:49 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:49 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:52 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:54 msgid "Create" msgstr "Crear" @@ -6640,76 +6730,76 @@ msgstr "Crear" msgid "Permissions" msgstr "Permisos" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1728 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1734 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1716 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1722 msgid "please, select a work report type" msgstr "por favor, seleccione un tipo de parte de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:486 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:487 msgid "List of materials for category: {0}" msgstr "Lista de materiais para a categoría: {0}" +#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36 +msgid "Cancel edition" +msgstr "Cancelar a edición" + #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:31 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 msgid "Total price" msgstr "Prezo total" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:436 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1230 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1242 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:786 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1044 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1295 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:419 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:625 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:46 +msgid "Labels without inheritance" +msgstr "Etiquetas sen herdanza" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1214 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:886 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1207 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1454 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:451 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:324 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:138 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:818 -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:126 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:271 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:223 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:362 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:530 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:544 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:272 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:293 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:289 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:163 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:223 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:306 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1265 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1242 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1204 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:332 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:405 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:694 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1207 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:201 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:333 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:406 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:646 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:408 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:948 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:954 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:232 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:955 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:961 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:264 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:84 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:69 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:117 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:132 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:70 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:118 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:133 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:88 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:45 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:46 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:49 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:92 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99 #: libreplan-webapp/src/main/webapp/materials/materials.zul:104 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:115 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:117 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:54 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:66 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:90 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:120 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:68 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:107 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:137 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:40 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:44 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:46 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:213 @@ -6718,19 +6808,19 @@ msgstr "Prezo total" #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67 #: libreplan-webapp/src/main/webapp/templates/_list.zul:53 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:129 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:171 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:106 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:147 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:188 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:109 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:150 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:110 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:109 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:150 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:117 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:158 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:133 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:175 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:102 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:143 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:184 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:105 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:106 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:105 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:146 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:113 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:154 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:127 msgid "Delete" msgstr "Borrar" @@ -6754,43 +6844,99 @@ msgstr "cabeceira" msgid "line" msgstr "liña" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:150 +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:34 +msgid "Use browser language configuration" +msgstr "Utilizar a configuración de idioma do navegador" + +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:35 +msgid "Galician" +msgstr "Galego" + +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:36 +msgid "Spanish" +msgstr "Castelán" + +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:37 +msgid "English" +msgstr "Inglés" + +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:38 +msgid "Russian" +msgstr "Ruso" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:172 msgid "unlimited" msgstr "ilimitado" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:83 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99 msgid "Monday" msgstr "Luns" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:83 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99 msgid "Tuesday" msgstr "Martes" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:83 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99 msgid "Wednesday" msgstr "Mércores" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:84 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100 msgid "Thursday" msgstr "Xoves" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:84 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100 msgid "Friday" msgstr "Venres" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:84 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100 msgid "Saturday" msgstr "Sábado" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:85 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:101 msgid "Sunday" msgstr "Domingo" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:135 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:31 +msgid "red (default)" +msgstr "vermello (defecto)" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:32 +msgid "green" +msgstr "verde" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:33 +msgid "blue" +msgstr "azul" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:34 +msgid "cyan" +msgstr "ciano" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:35 +msgid "magenta" +msgstr "maxenta" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:36 +msgid "yellow" +msgstr "amarelo" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:37 +msgid "black" +msgstr "negro" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:38 +msgid "orange" +msgstr "laranxa" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:39 +msgid "purple" +msgstr "púrpura" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139 msgid "Yes" msgstr "Si" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:135 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139 msgid "No" msgstr "Non" @@ -6798,35 +6944,19 @@ msgstr "Non" msgid "STRATEGIC RESOURCE" msgstr "RECURSO ESTRATÉXICO" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:37 -msgid "WORK_RELATIONSHIP" -msgstr "RELACIÓN_DE_TRABALLO" +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:39 +msgid "LOCATION" +msgstr "LOCALIZACIÓN" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:43 -msgid "LOCATION_GROUP" -msgstr "GRUPO_DE_LOCALIZACIÓN" - -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:50 -msgid "MACHINE LOCATION_GROUP" -msgstr "GRUPO_DE_LOCALIZACIÓN DE MÁQUINA" - -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:58 -msgid "LEAVE" -msgstr "BAIXA" - -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:64 -msgid "TRAINING" -msgstr "FORMACIÓN" - -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:70 -msgid "JOB" -msgstr "TRABALLO" - -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:76 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:46 msgid "CATEGORY" msgstr "CATEGORÍA" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:206 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:53 +msgid "SKILL" +msgstr "HABILIDADE" + +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:207 msgid "[generic all machines]" msgstr "[xenérico todas as máquinas]" @@ -6866,15 +6996,15 @@ msgstr "por porcentaxe" msgid "by items" msgstr "por ítems" -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:107 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:109 msgid "Hours cost type cannot be empty or null" msgstr "O tipo de coste de horas non pode ser baleiro ou nulo" -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:116 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:118 msgid "Init date cannot be empty or null" msgstr "A data de inicio non pode ser baleira ou nula" -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:121 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:123 msgid "End date cannot be empty or null" msgstr "A data de fin non pode ser baleira ou nula" @@ -6918,7 +7048,7 @@ msgstr "" "O valor das horas de traballo non é válido, tendo en conta a lista actual de " "grupos de horas" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:577 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:618 msgid "" "Some ancestor has the same label assigned, so this element is already " "inheriting this label" @@ -6926,17 +7056,17 @@ msgstr "" "Algún ancestro ten a misma etiqueta asignada, polo que este elemento xa está " "herdando esa etiqueta" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:676 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:717 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:963 msgid "Cannot spread two progress in the same task" msgstr "Non poden propagar dous progresos na mesma tarefa" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:700 -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:726 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:741 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:767 msgid "Duplicate Progress Assignment For Task" msgstr "Asignación de progreso duplicada para a tarefa" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1053 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1094 msgid "Quality form already exists" msgstr "O formulario de calidade xa existe" @@ -7038,14 +7168,18 @@ msgid "You can not modifiy this entity sequence, it is already in use" msgstr "Non pode modificar esta secuencia de entidade, xa está en uso" #: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:36 +msgid "Spreading progress" +msgstr "Progreso que propaga" + +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:37 msgid "Progress with all tasks by hours" msgstr "Progreso con todas as tarefas por horas" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:37 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:38 msgid "Progress with critical path tasks by hours" msgstr "Progreso coas tarefas no camiño crítico por horas" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:38 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:39 msgid "Progress with critical path tasks by duration" msgstr "Progreso coas tarefas do camiño crítico por duración" @@ -7066,19 +7200,19 @@ msgstr "Envío fallido" msgid "Success sent" msgstr "Envío exitoso" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:58 -msgid "None" -msgstr "Ningún" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:76 +msgid "Flat" +msgstr "Plano" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:59 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:78 msgid "Stretches" msgstr "Tramos" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:60 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:79 msgid "Interporlation" msgstr "Interpolación" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:61 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:80 msgid "Sigmoid" msgstr "Sigmoide" @@ -7167,6 +7301,281 @@ msgid "A queue dependency has to have an origin different from destiny" msgstr "" "Unha dependencia da cola ten que ter unha orixe diferente do seu destino" +#~ msgid "Up to company view" +#~ msgstr "Arriba á vista da compañía" + +#~ msgid "login name not specified" +#~ msgstr "nome de usuario non especificado" + +#~ msgid "Progress Consolidation" +#~ msgstr "Consolidación de progreso" + +#~ msgid "" +#~ "The first stretch must be after the first day for doing interpolation" +#~ msgstr "" +#~ "O primeiro tramo debe estar despois do primeiro día para facer " +#~ "interpolación" + +#~ msgid "Cannot delete user: it does not exist anymore" +#~ msgstr "Non se pode borrar o usuario: xa non existe" + +#~ msgid "Machine deleted" +#~ msgstr "Máquina borrada" + +#~ msgid "Create new version" +#~ msgstr "Crear versión nova" + +#~ msgid "Derived" +#~ msgstr "Derivado" + +#~ msgid "" +#~ "You can not remove the company \"{0}\" because is already in use in some " +#~ "project or in some subcontrated task." +#~ msgstr "" +#~ "Non pode eliminar a empresa \"{0}\" porque está sendo utilizada nalgún " +#~ "proxecto ou nalgunha tarefa subcontrada." + +#~ msgid "Error setting up creation form." +#~ msgstr "Erro preparando o formulario de creación." + +#~ msgid "Project does not exist" +#~ msgstr "O proxecto non existe" + +#~ msgid "Edit Scenario" +#~ msgstr "Editar escenario" + +#~ msgid "Confirm deleting this cost category. Are you sure?" +#~ msgstr "Confirmar o borrado desta categoría de custo. ¿Está seguro?" + +#~ msgid "Error removing element: " +#~ msgstr "Erro ao borrar elemento: " + +#~ msgid "Create Criterion Type" +#~ msgstr "Crear tipo de criterio" + +#~ msgid "It not could remove the task " +#~ msgstr "Non se puido borrar a tarefa " + +#~ msgid "Create Work Hours Type" +#~ msgstr "Crear novo tipo de horas de traballo" + +#~ msgid "CriterionType and its criteria saved" +#~ msgstr "Tipo de criterio e os seus criterios gardados" + +#~ msgid "Error on removing typeOfWorkHours: " +#~ msgstr "Erro borrando tipo de horas de traballo : " + +#~ msgid "password not specified" +#~ msgstr "contrasinal non especificado" + +#~ msgid "Edit Company" +#~ msgstr "Editar empresa" + +#~ msgid "Profile saved" +#~ msgstr "Perfil gardado" + +#~ msgid "You need to select some function to configure" +#~ msgstr "Necesita seleccionar algunha función para configurar" + +#~ msgid "there must be {0} effort instead of {1}" +#~ msgstr "debe haber {0} esforzo en lugar de {1}" + +#~ msgid "The cost category had already been removed." +#~ msgstr "A categoría de custo xa fora borrada." + +#~ msgid "Create Scenario" +#~ msgstr "Crear Escenario" + +#~ msgid "Delete item. Are you sure?" +#~ msgstr "Borrar elemento. ¿Está seguro?" + +#~ msgid "Create Label Type" +#~ msgstr "Crear tipo de etiqueta" + +#~ msgid "Create Work Report Type" +#~ msgstr "Crear tipo de parte de traballo" + +#~ msgid "incorrect initialization of the progress assignment controller." +#~ msgstr "inicialización incorrecta do controlador de asignación de progreso." + +#~ msgid "Error setting up creation form for Criterion Type" +#~ msgstr "Erro preparando o formulario de creación para un tipo de criterio" + +#~ msgid "Edit Cost Category" +#~ msgstr "Editar categoría de custo" + +#~ msgid "Confirm deleting this machine. Are you sure?" +#~ msgstr "Confirmar o borrado desta máquina. ¿Está seguro?" + +#~ msgid "Edit Profile" +#~ msgstr "Editar perfil" + +#~ msgid "Edit Progress Type" +#~ msgstr "Editar tipo de progreso" + +#~ msgid "Company saved" +#~ msgstr "Empresa gardada" + +#~ msgid "Type of work hours saved" +#~ msgstr "Tipo de horas de traballo gardado" + +#~ msgid "Create Quality Form" +#~ msgstr "Crear formulario de calidade" + +#~ msgid "Error setting up edition form." +#~ msgstr "Erro preparando o formulario de edición." + +#~ msgid "Cost category saved" +#~ msgstr "Categoría de custo gardada" + +#~ msgid "Progress type saved" +#~ msgstr "Tipo de progreso gardado" + +#~ msgid "Select the date from which the new version will be valid" +#~ msgstr "Seleccione a data a partir da cal a versión nova será válida" + +#~ msgid "Edit Work Hours Type" +#~ msgstr "Editar tipo de horas de traballo" + +#~ msgid "Machine saved" +#~ msgstr "Máquina gardada" + +#~ msgid "Create Cost Category" +#~ msgstr "Crear categoría de custo" + +#~ msgid "Cannot delete profile: it does not exist anymore" +#~ msgstr "Non se pode borrar o perfil: xa non existe" + +#~ msgid "Edit Machine" +#~ msgstr "Editar máquina" + +#~ msgid "Edit User" +#~ msgstr "Editar usuario" + +#~ msgid "D" +#~ msgstr "D" + +#~ msgid "Sigmoid function" +#~ msgstr "Función sigmoide" + +#~ msgid "Create From Template" +#~ msgstr "Crear a partir de modelo" + +#~ msgid "Create Exception Day Type" +#~ msgstr "Crear tipo de día de excepción" + +#~ msgid "Could not save machine" +#~ msgstr "Non se puido gardar a máquina" + +#~ msgid "Label type saved" +#~ msgstr "Tipo de etiqueta gardado" + +#~ msgid "Create Order" +#~ msgstr "Crear proxecto" + +#~ msgid "Create User" +#~ msgstr "Crear usuario" + +#~ msgid "Create new project from template" +#~ msgstr "Crear novo proxecto a partir de modelo" + +#~ msgid "Error on removing workReportType: " +#~ msgstr "Erro ao borrar tipo de parte de traballo: " + +#~ msgid "Edit Label Type" +#~ msgstr "Editar tipo de etiqueta" + +#~ msgid "Work report type saved" +#~ msgstr "Tipo de partes de traballo gardado" + +#~ msgid "Edit Quality Form" +#~ msgstr "Editar formulario de calidade" + +#~ msgid "Confirm deleting this profile. Are you sure?" +#~ msgstr "Confirmar o borrado deste perfil. ¿Está seguro?" + +#~ msgid "Calendar Exception Type saved" +#~ msgstr "Tipo de excepción de calendario gardado" + +#~ msgid "Quality form saved" +#~ msgstr "Formulario de calidade gardado" + +#~ msgid "Create Unit Type" +#~ msgstr "Crear tipo de unidade" + +#~ msgid "Confirm deleting this User. Are you sure?" +#~ msgstr "Confirmar o borrado deste usuario. ¿Está seguro?" + +#~ msgid "Edit Exception Day Type" +#~ msgstr "Editar tipo de día de excepción" + +#~ msgid "Unit type saved" +#~ msgstr "Tipo de unidade gardado" + +#~ msgid "Create Machine" +#~ msgstr "Crear máquina" + +#~ msgid "Create Company" +#~ msgstr "Crear empresa" + +#~ msgid "Choosing Template" +#~ msgstr "Selección de modelo" + +#~ msgid "Edit Criterion Type" +#~ msgstr "Editar tipo de criterio" + +#~ msgid "Label saved" +#~ msgstr "Etiqueta gardada" + +#~ msgid "login name is already being used by another user" +#~ msgstr "o nome de usuario xa está sendo usado" + +#~ msgid "Advanced assignment saved" +#~ msgstr "Asignación avanzada gardada" + +#~ msgid "Create Profile" +#~ msgstr "Crear perfil" + +#~ msgid "Go to advanced Allocation" +#~ msgstr "Ir a asignación avanzada" + +#~ msgid "Edit Unit Type" +#~ msgstr "Editar tipo de unidade" + +#~ msgid "" +#~ "Cannot delete that cost category because there are resources assigned to " +#~ "it." +#~ msgstr "" +#~ "Non se pode borrara categoría de custo porque hai recursos asignados a " +#~ "ela." + +#~ msgid "Average of the worked hours" +#~ msgstr "Media de horas traballadas" + +#~ msgid "Sigmoid function applied to current resource" +#~ msgstr "Función sigmoide aplicada ao recurso actual" + +#~ msgid "Deleted unit type {0}" +#~ msgstr "Borrado tipo de unidade {0}" + +#~ msgid "WORK_RELATIONSHIP" +#~ msgstr "RELACIÓN_DE_TRABALLO" + +#~ msgid "MACHINE LOCATION_GROUP" +#~ msgstr "GRUPO_DE_LOCALIZACIÓN DE MÁQUINA" + +#~ msgid "LEAVE" +#~ msgstr "BAIXA" + +#~ msgid "TRAINING" +#~ msgstr "FORMACIÓN" + +#~ msgid "JOB" +#~ msgstr "TRABALLO" + +#~ msgid "None" +#~ msgstr "Ningún" + #~ msgid "Derived from {0}" #~ msgstr "Derivado de {0}"