From 5a6e3fc048d9584448cb41d5cfd06930ae970a8a Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Wed, 11 May 2011 19:00:16 +0200 Subject: [PATCH] [i18n] Updated Spanish and Galician translations. FEA: ItEr74S03CommunityMaterialItEr73S03 --- ganttzk/src/main/resources/i18n/es.po | 128 +- ganttzk/src/main/resources/i18n/gl.po | 128 +- .../src/main/resources/i18n/es.po | 5845 ++++++++--------- .../src/main/resources/i18n/gl.po | 5845 ++++++++--------- 4 files changed, 5570 insertions(+), 6376 deletions(-) diff --git a/ganttzk/src/main/resources/i18n/es.po b/ganttzk/src/main/resources/i18n/es.po index 1d5c93e3a..84017e998 100644 --- a/ganttzk/src/main/resources/i18n/es.po +++ b/ganttzk/src/main/resources/i18n/es.po @@ -10,9 +10,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 1.0.4\n" +"Project-Id-Version: 1.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-08 10:41+0200\n" +"POT-Creation-Date: 2011-05-11 18:16+0200\n" "PO-Revision-Date: 2011-04-08 11:11+0200\n" "Last-Translator: Manuel Rego Casasnovas \n" "Language-Team: Spanish <>\n" @@ -22,126 +22,126 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:214 -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:233 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:215 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:234 msgid "Erase" msgstr "Borrar" -#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:308 +#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:319 msgid "Add Dependency" msgstr "Añadir dependencia" -#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:57 +#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58 msgid "Worker" msgstr "Trabajador" -#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:28 +#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:29 msgid "Start" msgstr "Inicio" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:591 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:592 msgid "Show reported hours" msgstr "Mostrar horas reportadas" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:75 +#: 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/ResourcesLoadPanel.java:88 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:92 msgid "by criteria" msgstr "por criterios" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:82 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:70 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:45 +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:36 msgid "Zoom" msgstr "Zoom" -#: ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java:120 +#: ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java:121 msgid "Limiting resources" msgstr "Recursos limitantes" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:67 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:68 msgid "The specified dependency is not allowed" msgstr "La dependencia especificada no está permitida" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:253 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:254 msgid "Set End-End" msgstr "Definir Fin-Fin" -#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:57 +#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58 msgid "Task" msgstr "Tarea" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:87 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:91 msgid "by resources" msgstr "por recursos" -#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:63 +#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:64 msgid "Criterion" msgstr "Criterio" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:41 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:40 msgid "Print" msgstr "Imprimir" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:189 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:190 msgid "total work hours: {0}, assigned hours: {1}" msgstr "total de horas trabajables: {0}, horas asignadas: {1}" -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:70 +#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:71 msgid "Week" msgstr "Semana" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java:110 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java:111 msgid "See scheduling" msgstr "Ver planificación" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:449 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:489 msgid "filtering by name" msgstr "filtrando por nombre" -#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:29 +#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:30 msgid "End" msgstr "Fin" -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:242 +#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:243 msgid "changing zoom" msgstr "cambiando zoom" -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:44 +#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:45 msgid "Quarter" msgstr "Trimestre" -#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:57 +#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58 msgid "None" msgstr "Ninguno" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:68 -msgid "Flatten/Unflatten tree" -msgstr "Aplanar/expandir árbol" - -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:43 +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:44 msgid "Filter" msgstr "Filtro" -#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:57 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:67 +msgid "Flatten/Unflatten tree" +msgstr "Aplanar/expandir árbol" + +#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58 msgid "Project" msgstr "Proyecto" -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:50 +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:51 msgid "Name filter" msgstr "Filtro por nombres" -#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:27 -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:68 +#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:28 +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:69 msgid "Name" msgstr "Nombre" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:571 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:572 msgid "Show progress" msgstr "Mostrar progreso" @@ -149,19 +149,19 @@ msgstr "Mostrar progreso" msgid "Expand/Collapse all" msgstr "Expandir/plegar todo" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:34 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:36 msgid "Create Project" msgstr "Crear proyecto" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:141 -msgid "showing criteria" -msgstr "mostrando criterios" - -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:31 +#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:32 msgid "Year" msgstr "Año" -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:57 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:145 +msgid "showing criteria" +msgstr "mostrando criterios" + +#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:58 msgid "Month" msgstr "Mes" @@ -169,23 +169,23 @@ msgstr "Mes" msgid "Show/Hide resources" msgstr "Mostrar/ocultar recursos" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:245 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:246 msgid "Set End-Start" msgstr "Definir Fin-Inicio" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:301 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:302 msgid "decreasing zoom" msgstr "reduciendo zoom" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:558 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:559 msgid "Hide critical path" msgstr "Ocultar camino crítico" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:598 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:599 msgid "Hide reported hours" msgstr "Ocultar horas reportadas" -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:83 +#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:84 msgid "Day" msgstr "Día" @@ -193,11 +193,11 @@ msgstr "Día" msgid "Show/Hide Critical path" msgstr "Mostrar/ocultar camino crítico" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:138 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:142 msgid "showing resources" msgstr "mostrando recursos" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:183 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:184 msgid "Load: {0}%" msgstr "Carga: {0}%" @@ -205,32 +205,32 @@ msgstr "Carga: {0}%" msgid "Show/Hide labels" msgstr "Mostrar/ocultar etiquetas" -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:96 +#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:97 msgid "Hour" msgstr "Hora" -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:91 -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:111 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:114 +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:92 msgid "Graphics" msgstr "Gráficas" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:249 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:250 msgid "Set Start-Start" msgstr "Definir Inicio-Inicio" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:142 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:143 msgid "See resource allocation" msgstr "Ver asignación de recursos" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:284 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:285 msgid "increasing zoom" msgstr "aumentando zoom" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:415 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:455 msgid "Show all elements" msgstr "Mostrar todos los elementos" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:414 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:454 msgid "All" msgstr "Todos" @@ -238,10 +238,10 @@ msgstr "Todos" msgid "Refresh" msgstr "Actualizar" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:553 -msgid "Show critical path" -msgstr "Mostrar camino crítico" - -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:576 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:577 msgid "Hide progress" msgstr "Ocultar progreso" + +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:554 +msgid "Show critical path" +msgstr "Mostrar camino crítico" diff --git a/ganttzk/src/main/resources/i18n/gl.po b/ganttzk/src/main/resources/i18n/gl.po index b46a25f0e..1859e9d48 100644 --- a/ganttzk/src/main/resources/i18n/gl.po +++ b/ganttzk/src/main/resources/i18n/gl.po @@ -10,9 +10,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 1.0.4\n" +"Project-Id-Version: 1.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-08 10:41+0200\n" +"POT-Creation-Date: 2011-05-11 18:16+0200\n" "PO-Revision-Date: 2011-04-08 11:11+0200\n" "Last-Translator: Manuel Rego Casasnovas \n" "Language-Team: Galician <>\n" @@ -22,126 +22,126 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:214 -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:233 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:215 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:234 msgid "Erase" msgstr "Borrar" -#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:308 +#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:319 msgid "Add Dependency" msgstr "Engadir dependencia" -#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:57 +#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58 msgid "Worker" msgstr "Traballador" -#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:28 +#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:29 msgid "Start" msgstr "Inicio" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:591 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:592 msgid "Show reported hours" msgstr "Mostrar horas reportadas" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:75 +#: 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/ResourcesLoadPanel.java:88 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:92 msgid "by criteria" msgstr "por criterios" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:82 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:70 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:45 +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:36 msgid "Zoom" msgstr "Zoom" -#: ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java:120 +#: ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java:121 msgid "Limiting resources" msgstr "Recursos limitantes" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:67 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:68 msgid "The specified dependency is not allowed" msgstr "A dependencia especificada non está permitida" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:253 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:254 msgid "Set End-End" msgstr "Definir Fin-Fin" -#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:57 +#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58 msgid "Task" msgstr "Tarefa" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:87 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:91 msgid "by resources" msgstr "por recursos" -#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:63 +#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:64 msgid "Criterion" msgstr "Criterio" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:41 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:40 msgid "Print" msgstr "Imprimir" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:189 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:190 msgid "total work hours: {0}, assigned hours: {1}" msgstr "total de horas traballables: {0}, horas asignadas: {1}" -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:70 +#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:71 msgid "Week" msgstr "Semana" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java:110 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java:111 msgid "See scheduling" msgstr "Ver planificación" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:449 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:489 msgid "filtering by name" msgstr "filtrando por nome" -#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:29 +#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:30 msgid "End" msgstr "Fin" -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:242 +#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:243 msgid "changing zoom" msgstr "cambiando zoom" -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:44 +#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:45 msgid "Quarter" msgstr "Trimestre" -#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:57 +#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58 msgid "None" msgstr "Ningún" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:68 -msgid "Flatten/Unflatten tree" -msgstr "Aplanar/expandir árbore" - -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:43 +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:44 msgid "Filter" msgstr "Filtro" -#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:57 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:67 +msgid "Flatten/Unflatten tree" +msgstr "Aplanar/expandir árbore" + +#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58 msgid "Project" msgstr "Proxecto" -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:50 +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:51 msgid "Name filter" msgstr "Filtro por nomes" -#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:27 -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:68 +#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:28 +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:69 msgid "Name" msgstr "Nome" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:571 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:572 msgid "Show progress" msgstr "Mostrar progreso" @@ -149,19 +149,19 @@ msgstr "Mostrar progreso" msgid "Expand/Collapse all" msgstr "Expandir/pregar todo" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:34 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:36 msgid "Create Project" msgstr "Crear proxecto" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:141 -msgid "showing criteria" -msgstr "mostrando criterios" - -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:31 +#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:32 msgid "Year" msgstr "Ano" -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:57 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:145 +msgid "showing criteria" +msgstr "mostrando criterios" + +#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:58 msgid "Month" msgstr "Mes" @@ -169,23 +169,23 @@ msgstr "Mes" msgid "Show/Hide resources" msgstr "Mostrar/ocultar recursos" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:245 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:246 msgid "Set End-Start" msgstr "Definir Fin-Inicio" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:301 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:302 msgid "decreasing zoom" msgstr "reducindo zoom" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:558 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:559 msgid "Hide critical path" msgstr "Ocultar camiño crítico" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:598 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:599 msgid "Hide reported hours" msgstr "Ocultar horas reportadas" -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:83 +#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:84 msgid "Day" msgstr "Día" @@ -193,11 +193,11 @@ msgstr "Día" msgid "Show/Hide Critical path" msgstr "Ocultar/ocultar camiño crítico" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:138 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:142 msgid "showing resources" msgstr "mostrando recursos" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:183 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:184 msgid "Load: {0}%" msgstr "Carga: {0}%" @@ -205,32 +205,32 @@ msgstr "Carga: {0}%" msgid "Show/Hide labels" msgstr "Mostrar/ocultar etiquetas" -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:96 +#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:97 msgid "Hour" msgstr "Hora" -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:91 -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:111 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:114 +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:92 msgid "Graphics" msgstr "Gráficas" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:249 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:250 msgid "Set Start-Start" msgstr "Definir Inicio-Inicio" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:142 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:143 msgid "See resource allocation" msgstr "Ver asignación de recursoss" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:284 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:285 msgid "increasing zoom" msgstr "aumentando zoom" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:415 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:455 msgid "Show all elements" msgstr "Mostrar tódolos elementos" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:414 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:454 msgid "All" msgstr "Todos" @@ -238,10 +238,10 @@ msgstr "Todos" msgid "Refresh" msgstr "Actualizar" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:553 -msgid "Show critical path" -msgstr "Mostrar camiño crítico" - -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:576 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:577 msgid "Hide progress" msgstr "Ocultar progreso" + +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:554 +msgid "Show critical path" +msgstr "Mostrar camiño crítico" diff --git a/navalplanner-webapp/src/main/resources/i18n/es.po b/navalplanner-webapp/src/main/resources/i18n/es.po index 2736b4ad8..669f13891 100644 --- a/navalplanner-webapp/src/main/resources/i18n/es.po +++ b/navalplanner-webapp/src/main/resources/i18n/es.po @@ -10,10 +10,10 @@ # msgid "" msgstr "" -"Project-Id-Version: 1.0.4\n" +"Project-Id-Version: 1.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-08 10:41+0200\n" -"PO-Revision-Date: 2011-04-08 11:11+0200\n" +"POT-Creation-Date: 2011-05-11 18:16+0200\n" +"PO-Revision-Date: 2011-05-11 19:37+0200\n" "Last-Translator: Manuel Rego Casasnovas \n" "Language-Team: Spanish <>\n" "Language: es\n" @@ -22,355 +22,342 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:350 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:368 msgid "The resource cannot be null" msgstr "El recurso no puede ser nulo" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:418 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:419 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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:95 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:96 msgid "No authorizations were added because you did not select any." msgstr "No se pueden añadir autorizaciones porque no se seleccionó ninguna." -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:95 -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:44 -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:53 -#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:70 -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:50 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:88 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:45 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:54 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:58 +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:71 msgid "en" msgstr "es" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:154 -msgid "Create exception" -msgstr "Crear excepción" - -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:145 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:188 msgid "Origin" msgstr "Origen" +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:165 +msgid "Create exception" +msgstr "Crear excepción" + #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:45 msgid "Select report data" msgstr "Seleccione fecha del informe" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:389 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:399 msgid "Up to company view" msgstr "Arriba a la vista de la compañía" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:206 +#: navalplanner-webapp/src/main/java/org/navalplanner/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}" -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:59 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:60 msgid "Create Virtual Worker" msgstr "Crear trabajador virtual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:97 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:821 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:140 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:130 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:27 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:75 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29 -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:39 -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:38 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:33 -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:43 -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:36 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:39 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:38 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:28 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:97 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:139 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:180 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:101 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:142 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:99 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:127 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:98 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:820 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:109 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:150 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:122 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:91 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:119 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:159 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:97 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:139 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:180 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:101 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:101 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:142 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:77 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:28 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:231 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:35 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:158 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:68 -#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:37 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:39 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:61 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:87 -#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:28 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:146 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:233 -#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:29 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:269 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:34 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:39 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:40 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:50 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:51 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:54 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:69 +#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:141 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:50 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:36 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:57 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:50 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:48 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:28 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:135 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:159 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:36 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:52 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:231 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35 msgid "Operations" msgstr "Operaciones" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:29 -msgid "Add criterion" -msgstr "Añadir criterio" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:134 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:194 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:149 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:535 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:135 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:195 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:150 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:536 msgid "There is no type of work hours with this code" msgstr "No hay un tipo de horas de trabajo con este código" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:100 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:154 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:107 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:84 msgid "Select" msgstr "Seleccionar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:355 -msgid "there must be {0} hours instead of {1}" -msgstr "debe haber {0} horas en lugar de {1}" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1280 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1356 msgid "It can not be empty" msgstr "No puede estar vacío" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:270 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:21 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:65 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:52 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:144 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:54 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:33 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:88 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:21 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:315 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:33 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:66 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:98 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:53 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:145 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:55 msgid "Materials" msgstr "Materiales" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:293 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:360 msgid "Reassign" msgstr "Reasignar" -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:61 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:62 msgid "Description cannot be null or empty" msgstr "La descripción no puede ser nula o vacía" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:78 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:79 msgid "login name not specified" msgstr "nombre de usuario no especificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MonteCarloTabCreator.java:78 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MonteCarloTabCreator.java:354 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MonteCarloTabCreator.java:79 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MonteCarloTabCreator.java:356 msgid "MonteCarlo Method" msgstr "Método de Montecarlo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:291 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:309 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:292 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:310 msgid "Project Scheduling" msgstr "Planificación de proyectos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:41 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:72 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:62 msgid "February" msgstr "Febrero" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:27 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:28 msgid "Managing fields and labels" msgstr "Administrar campos y etiquetas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:355 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:356 msgid "Please, select a calendar" msgstr "Por favor, seleccione un calendario" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:188 -msgid "Summary" -msgstr "Resumen" - -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28 -#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:161 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29 msgid "Predefined" msgstr "Predefinido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:271 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:66 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:267 +msgid "Summary" +msgstr "Resumen" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:316 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:67 msgid "Quality Forms" msgstr "Formularios de calidad" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:285 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:330 msgid "Reports" msgstr "Informes" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:167 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:168 msgid "The {0} sequence prefixes can not be repeated" msgstr "Los prefijos de secuencia de {0} no pueden repetirse" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:80 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:81 msgid "Criterion requirements" msgstr "Criterios requeridos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:95 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:97 msgid "START_NOT_EARLIER_THAN" msgstr "COMENZAR_NO_ANTES_DE" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:216 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:287 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: " -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:65 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:66 msgid "Dedication chart" msgstr "Gráfico de dedicación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:700 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:727 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:701 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:728 msgid "Progress that are reported by quality forms can not be modified" msgstr "" "El progreso notificado por formularios de calidad no pueden ser modificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:747 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:748 msgid "Not the same hours group, impossible to update" msgstr "No es el mismo grupo de horas, imposible actualizar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:519 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:43 +#: navalplanner-webapp/src/main/webapp/common/error.zul:48 +msgid "Stacktracke:" +msgstr "Stacktrace:" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:520 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." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:472 -msgid "Remove limiting resource element" -msgstr "Borrar elemento de recurso limitante" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:140 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:154 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:240 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:141 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:155 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:275 msgid "Resource Usage" msgstr "Uso de recursos" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:38 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:475 +msgid "Remove limiting resource element" +msgstr "Borrar elemento de recurso limitante" + +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:39 msgid "Active period from" msgstr "Período activo desde" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:51 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:52 msgid "hours type :" msgstr "tipo de horas :" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:480 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:481 msgid "Unassign" msgstr "Desasignar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:250 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:295 msgid "Companies" msgstr "Empresas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:504 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:505 msgid "Manual assignment" msgstr "Asignación manual" -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:72 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:73 msgid "Quality form items list" msgstr "Lista de elementos del formulario de calidad" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:239 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:217 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:218 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:240 msgid "" "End date is not valid, the new end date must be later the current end date" msgstr "" "La fecha de fin no es válida, la nueva fecha de fin debe ser posterior a la " "actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:45 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:51 msgid "generic workers allocation" msgstr "asignación genérica de trabajadores" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:63 -msgid "Select print visualization options" -msgstr "Seleccione las opciones de impresión de la visualización" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:797 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:796 msgid "Hour start" msgstr "Hora de inicio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:896 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:515 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:516 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:915 msgid "The project has no scheduled elements" msgstr "El proyecto no tiene elementos planificados" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:119 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:52 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:35 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:53 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:36 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:120 msgid "Start" msgstr "Comienzo" -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:33 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:34 msgid "Progress Report" msgstr "Informe de progreso" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:118 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:119 msgid "cost assignment's category not specified" msgstr "categoría de la asignación de coste no especificada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:71 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:72 msgid "Delete Template element" msgstr "Borrar elemento de plantilla" -#: navalplanner-webapp/src/main/webapp/planner/order.zul:89 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:96 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:90 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:97 msgid "Progress Consolidation" msgstr "Consolidación de progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/services/DBUserDetailsService.java:65 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/services/DBUserDetailsService.java:66 msgid "User with login name '{0}': not found" msgstr "Usuario con login '{0}': no encontrado" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:36 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:37 msgid "Resources capability" msgstr "Capacidad de recursos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:155 +#: navalplanner-webapp/src/main/java/org/navalplanner/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" -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:25 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26 msgid "Filter quality forms by :" msgstr "Filtrar formularios de calidad por :" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:260 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:31 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:305 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:32 msgid "Transfer Projects Between Scenarios" msgstr "Transferir proyectos entre escenarios" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:102 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:106 msgid "changing perspective" msgstr "cambio de perspectiva" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:123 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:124 msgid "" "Could not add those authorizations to profile {0} because they were already " "present." @@ -382,24 +369,25 @@ msgstr "" msgid "Default calendar" msgstr "Calendario por defecto" -#: navalplanner-webapp/src/main/webapp/users/profiles.zul:22 +#: navalplanner-webapp/src/main/webapp/users/profiles.zul:23 msgid "NavalPlan: Profiles" msgstr "NavalPlan: Perfiles" -#: navalplanner-webapp/src/main/webapp/common/error.zul:20 -msgid "NavalPlan: Error" -msgstr "NavalPlan: Error" - -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:74 msgid "Project Name" msgstr "Nombre del proyecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:930 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:303 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:306 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:931 msgid "Indent" msgstr "Indentar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:575 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:255 +msgid "Reassignation" +msgstr "Reasignación" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:730 msgid "" "The periods available depend on the satisfaction of the criterions by the " "resources and their calendars." @@ -407,40 +395,44 @@ msgstr "" "Los períodos disponibles dependen de la satisfacción de criterios por los " "recursos y sus calendarios." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:50 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:42 msgid "New template" msgstr "Plantilla nueva" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:127 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:38 +msgid "Total estimated hours" +msgstr "Horas estimadas totales" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:130 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:144 msgid "Base calendar \"{0}\" saved" msgstr "Calendario base \"{0}\" guardado" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:174 +msgid "Exceptions list" +msgstr "Lista de excepciones" + +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:32 msgid "Locations" msgstr "Ubicaciones" -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:75 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:76 msgid "New quality form item" msgstr "Nuevo elemento del formulario de calidad" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:145 -msgid "For interpolation at least two stretches are needed" -msgstr "Para interpolar se necesitan al menos dos tramos" - #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:41 msgid "Login name" msgstr "Nombre de usuario" -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:42 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:43 msgid "Current" msgstr "Actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:626 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:632 msgid "Machine deleted" msgstr "Máquina borrada" -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:21 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:22 msgid "NavalPlan: Progress Report" msgstr "NavalPlan: Informe de progreso" @@ -448,15 +440,15 @@ msgstr "NavalPlan: Informe de progreso" msgid "Dependencies" msgstr "Dependencias" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:185 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:187 msgid "missing code in a calendar exception" msgstr "falta código en una excepción de calendario" -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:85 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:78 msgid "Current selection" msgstr "Selección actual" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1116 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1134 msgid "" "there exist criterion satisfactions referring to criterion types not " "applicable to this resource" @@ -464,39 +456,47 @@ msgstr "" "existen criterios satisfechos que pertenecen a tipos de criterio no " "aplicables a este recurso" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:64 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:52 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:65 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:50 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:53 msgid "Criterion Requirement" msgstr "Criterio requerido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:62 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:31 +msgid "Show labels" +msgstr "Mostrar etiquetas" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:63 msgid "Minutes" msgstr "Minutos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:131 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:132 msgid "You can not remove a scenario with derived scenarios" msgstr "No se puede eliminar un escenario con escenarios derivados" -#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:22 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:23 msgid "Create new version" msgstr "Crear versión nueva" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:293 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/ResourceAllocationBehaviour.java:65 +msgid "LIMITING" +msgstr "LIMITANTE" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:324 msgid "Derived" msgstr "Derivado" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:349 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:414 msgid "a disabled resource has enabled subresources" msgstr "un recurso deshabilitado tiene subrecursos habilitados" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:28 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:51 msgid "Client" msgstr "Cliente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:152 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:613 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:153 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:614 msgid "" "there are no resources for required criteria: {0}. So the generic allocation " "can't be added" @@ -504,37 +504,45 @@ msgstr "" "no hay recursos con los criterios solicitados: {0}. Por tanto, no se puede " "añadir la asignación genérica" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:427 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:446 +msgid "Error on showing warning message removing calendar: " +msgstr "Error al mostrar mensaje de advertencia borrando calendario: " + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:428 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 " "campo" -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java:152 +#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java:153 msgid "material category name has to be unique. It is already used" msgstr "el nombre de la categoría de materiales debe ser único. Ya está en uso" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:43 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:108 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:46 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109 msgid "Imputed hours" msgstr "Horas imputadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:292 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:337 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:41 msgid "Project Costs Per Resource" msgstr "Costes de proyecto por recurso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:461 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:142 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:530 +#: navalplanner-webapp/src/main/java/org/navalplanner/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?" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/DeleteMilestoneCommand.java:58 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/DeleteMilestoneCommand.java:59 msgid "Delete Milestone" msgstr "Borrar hito" -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:47 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:152 +msgid "default password were not changed" +msgstr "la contraseña por defecto no fue cambiada" + +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:48 msgid "Non-assigned locations" msgstr "Ubicaciones no asignadas" @@ -542,7 +550,7 @@ msgstr "Ubicaciones no asignadas" msgid "Application URI" msgstr "URI de la aplicación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:417 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:418 msgid "" "The {0} is not valid, criterionType overlaps with other " "criterionSatisfaction from the same criterionType" @@ -550,94 +558,98 @@ msgstr "" "{0} no es válido, criterionType se solapa con otro criterionSatisfaction del " "mismo criterionType" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:286 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:331 msgid "Work Report Lines" msgstr "Líneas de parte de trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1446 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1466 msgid "Configure" msgstr "Configurar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:80 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:70 msgid "October" msgstr "Octubre" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:56 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:57 msgid "First name" msgstr "Nombre" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:245 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:252 msgid "Could not execute print command" msgstr "No se pudo ejecutar el comando de impresión" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:118 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:119 msgid "Complementary text fields" msgstr "Campos de texto complementario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:179 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:136 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:850 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:198 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:198 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1219 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:133 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:290 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:124 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:376 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:137 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:291 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:141 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:418 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:852 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:199 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:208 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1242 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:181 msgid "Confirm deleting {0}. Are you sure?" msgstr "Confirmar el borrado de {0}. ¿Está seguro?" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:36 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:37 msgid "Work Reports List" msgstr "Lista de partes de trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:267 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:312 msgid "Accounts" msgstr "Cuentas" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:46 -msgid "Edit selected task" -msgstr "Editar tarea seleccionada" - -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:84 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:85 msgid "External code" msgstr "Código externo" -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:38 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:37 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:96 -msgid "Limiting" -msgstr "Limitante" +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:47 +msgid "Edit selected task" +msgstr "Editar tarea seleccionada" -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:48 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:49 msgid "View" msgstr "Ver" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:309 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:88 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:39 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:38 +msgid "Limiting" +msgstr "Limitante" + +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:61 +msgid "Required materials" +msgstr "Materiales requeridos" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:311 msgid "Backwards" msgstr "Atrás" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:627 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:629 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" -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:67 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:77 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:68 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:78 msgid "Version" msgstr "Versión" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:50 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51 msgid "Apply filtering to resources satisfying required criteria" msgstr "" "Aplicar filtrado a los recursos que satisfacen los criterios requeridos" -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:103 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:104 msgid "Up" msgstr "Arriba" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:183 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:184 msgid "" "CriterionType is not valid, it overlaps other criterionSatisfaction with the " "same criterionType" @@ -649,7 +661,7 @@ msgstr "" msgid "Types of work hours" msgstr "Tipos de horas de trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:126 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:127 msgid "EAC" msgstr "EAC" @@ -661,7 +673,7 @@ msgstr "" "Su planificación no está en el escenario actual.\n" "Debe cambiar a uno de los siguientes:\n" -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:36 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:37 msgid "Predecessor" msgstr "Predecesor" @@ -669,29 +681,29 @@ msgstr "Predecesor" msgid "Please select a task" msgstr "Por favor, seleccione una tarea" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:135 +#: navalplanner-webapp/src/main/java/org/navalplanner/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" -#: navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul:22 +#: navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul:23 msgid "NavalPlan: Cost Categories" msgstr "NavalPlan: Categorías de coste" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:59 -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:57 -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:74 -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:62 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:58 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:75 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:60 msgid "End date" msgstr "Fecha de fin" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:254 +#: navalplanner-webapp/src/main/java/org/navalplanner/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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:140 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:142 msgid "" "Value is not valid, the default max value must be greater than the precision " "value " @@ -699,7 +711,7 @@ msgstr "" "El valor no es válido, el valor máximo por defecto debe ser mayor que el " "valor de precisión" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:145 +#: navalplanner-webapp/src/main/java/org/navalplanner/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." @@ -707,7 +719,7 @@ msgstr "" "No puede borrar la empresa \"{0}\" porque está siendo utilizada en ulgún " "proyecto o en alguna tarea subcontrada." -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:87 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:88 msgid "profile name is already being used by another profile" msgstr "el nombre del perfil ya está siendo usado por otro perfil" @@ -719,190 +731,188 @@ msgstr "Correo electrónico" msgid "Prefix:" msgstr "Prefijo:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:106 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:109 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:111 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:107 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:110 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:112 msgid "This project has already been added." msgstr "Este proyecto ya ha sido añadido." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:275 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:579 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:35 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:47 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:43 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:580 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:320 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 msgid "Criteria" msgstr "Criterios" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:363 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:381 msgid "The task code cannot be null" msgstr "El código de la tarea no puede ser nulo" +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:138 +msgid "Resource / Criteria" +msgstr "Recursos / Criterios" + #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:26 msgid "User data" msgstr "Datos del usuario" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 -msgid "Resource / Criteria" -msgstr "Recursos / Criterios" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:84 -msgid "AS_SOON_AS_POSSIBLE" -msgstr "TAN_PRONTO_COMO_SEA_POSIBLE" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:96 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:97 msgid "Error setting up creation form." msgstr "Error preparando el formulario de creación." -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:86 +msgid "AS_SOON_AS_POSSIBLE" +msgstr "TAN_PRONTO_COMO_SEA_POSIBLE" + +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:29 msgid "Add new progress assignment" msgstr "Añadir nueva asignación de progreso" -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:43 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:44 msgid "Lines" msgstr "Líneas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:192 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:193 msgid "Error on showing warning message removing workReportType: " msgstr "" "Error al mostrar mensaje de advertencia borrando tipo de parte de trabajo: " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:625 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:624 msgid "Edit Work Report" msgstr "Editar parte de trabajo" -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:21 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:22 msgid "Quality Forms List" msgstr "Lista de formularios de calidad" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:169 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:170 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" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:30 msgid "Personal data" msgstr "Datos personales" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:298 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:161 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:199 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:157 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:198 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:299 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:162 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:158 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:199 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:200 msgid "please, select a Criterion" msgstr "por favor, seleccione un criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:731 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:732 msgid "Calculated progress can not be removed" msgstr "El progreso calculado no se puede borrar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java:126 -msgid "Project does not exist" -msgstr "El proyecto no existe" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:76 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:66 msgid "June" msgstr "Junio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java:92 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java:127 +msgid "Project does not exist" +msgstr "El proyecto no existe" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/EntryPointsHandler.java:143 msgid "{0} annotation required on {1}" msgstr "{0} anotación obligatoria en {1}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:1030 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:1031 msgid "Modified" msgstr "Modificado" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:215 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:216 msgid "Add Criterion" msgstr "Añadir criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:642 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:126 +msgid "You can not remove the current scenario" +msgstr "No se puede borrar el escenario actual" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:643 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." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:125 -msgid "You can not remove the current scenario" -msgstr "No se puede borrar el escenario actual" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:88 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:329 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:334 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:89 msgid "MessagesContainer is needed" msgstr "Es necesario un MessagesContainer" -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:37 msgid "Project element code" msgstr "Código de la tarea" -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:41 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28 -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:68 -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:43 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:69 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:42 msgid "Ending date" msgstr "Fecha de fin" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:75 -msgid "Show all progress" -msgstr "Mostrar todo el progreso" - -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:20 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:21 msgid "Templates List" msgstr "Lista de plantillas" +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:29 +msgid "Export options" +msgstr "Opciones de exportación" + +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:34 +msgid "Subcontracted Tasks List" +msgstr "Lista de tareas subcontratadas" + #: navalplanner-webapp/src/main/webapp/common/configuration.zul:229 msgid "Last value" msgstr "Último valor" -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:33 -msgid "Subcontracted Tasks List" -msgstr "Lista de tareas subcontratadas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:704 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:705 msgid "Calculated progress can not be modified" msgstr "El progreso calculado no se puede modificar" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:68 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:69 msgid "Statistics log" msgstr "Histórico de estadísticas" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:46 -#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:39 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:47 +#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:40 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:51 msgid "Edit Calendar" msgstr "Editar calendario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:294 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:339 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:41 msgid "Materials Needs At Date" msgstr "Necesidades de materiales en fecha" +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:41 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:52 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:40 msgid "Cannot be empty or null" msgstr "No puede ser vacío o nulo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:274 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:275 msgid "filtering" msgstr "filtrado" -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:33 msgid "Total Budget" msgstr "Presupuesto total" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:52 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:53 msgid "Hierarchy" msgstr "Jerarquía" -#: navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:22 +#: navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:23 msgid "NavalPlan: Work Hours" msgstr "NavalPlan: Horas de trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:812 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:830 msgid "" "This worker cannot be deleted because it has assignments to projects or " "imputed hours" @@ -910,24 +920,24 @@ msgstr "" "Este trabajador no se puede borrar porque tiene asignaciones a proyectos u " "horas imputadas" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:25 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:26 msgid "Print configuration" msgstr "Imprimir configuración" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:26 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:27 msgid "Overload due to other assignments" msgstr "Sobrecarga debido a otras asignaciones" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:148 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:149 msgid "Time period saved" msgstr "Período de tiempo guardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:304 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:167 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:205 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:163 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:204 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:305 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:168 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:164 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:205 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:206 msgid "This Criterion has already been added." msgstr "Este criterio ya ha sido añadido." @@ -939,76 +949,79 @@ msgstr "añadir" msgid "Unsaved changes will be lost. Would you like to continue?" msgstr "Se perderán los cambios sin guardar. ¿Le gustaría continuar?" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:40 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:34 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:35 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:41 msgid "Filter work report by :" msgstr "Filtrar parte de trabajo por :" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeModel.java:84 -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" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:245 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:290 msgid "Workers" msgstr "Trabajadores" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:78 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/ResourceAllocationBehaviour.java:40 +msgid "NON_LIMITING" +msgstr "NO_LIMITANTE" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeModel.java:102 +msgid "Cannot remove {0}, since it is being used by some Exception Day" +msgstr "No se puede borrar {0} porque se está usando en algún día de excepción" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:68 msgid "August" msgstr "Agosto" -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:57 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:53 msgid "Resources matching selected criteria" msgstr "Recursos que cumplen los criterios seleccionados" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:54 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:62 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:52 msgid "Year" msgstr "Año" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:66 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:67 msgid "profile name not specified" msgstr "nombre del perfil no especificado" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:61 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:62 msgid "Date Start" msgstr "Fecha de inicio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1280 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1281 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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:54 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:55 msgid "From Chosen" msgstr "A partir de elegidos" +#: navalplanner-webapp/src/main/webapp/planner/order.zul:109 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67 +msgid "Value" +msgstr "Valor" + #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:64 msgid "Hour costs" msgstr "Costes por hora" -#: navalplanner-webapp/src/main/webapp/planner/order.zul:108 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:66 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:55 -msgid "Value" -msgstr "Valor" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:558 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:713 msgid "there are no valid periods for this calendar" msgstr "no hay períodos válidos para este calendario" -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:40 -msgid "Edit Scenario" -msgstr "Editar escenario" - #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:76 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:52 msgid "Add role" msgstr "Añadir rol" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:568 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1039 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:41 +msgid "Edit Scenario" +msgstr "Editar escenario" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:643 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1113 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 " @@ -1018,11 +1031,11 @@ msgstr "" msgid "Project from client" msgstr "Proyecto del cliente" -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:21 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:22 msgid "Progress Types List" msgstr "Lista de tipos de progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:414 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:415 msgid "" "The {0} can not be assigned to this resource. Its interval overlaps with " "other criterion" @@ -1034,11 +1047,11 @@ msgstr "" msgid "Work done until ending date:" msgstr "Trabajo realizado hasta la fecha de fin:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:131 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:132 msgid "Schedule Performance Index" msgstr "Índice de rendimiento de la planificación" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:138 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:139 msgid "Earlier starting date" msgstr "Fecha de inicio más temprana" @@ -1046,31 +1059,31 @@ msgstr "Fecha de inicio más temprana" msgid "Type data" msgstr "Datos del tipo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:268 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:313 msgid "Profiles" msgstr "Perfiles" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:801 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:800 msgid "Hour finish" msgstr "Hora de fin" -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:39 -msgid "Edit Work Report Type" -msgstr "Editar tipo de parte de trabajo" - #: navalplanner-webapp/src/main/webapp/common/configuration.zul:173 msgid "Perspectives" msgstr "Perspectivas" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:78 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:40 +msgid "Edit Work Report Type" +msgstr "Editar tipo de parte de trabajo" + +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:104 msgid "Workable time" msgstr "Tiempo trabajable" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:239 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:240 msgid "missing code in a subcategory" msgstr "falta código en una subcategoría" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:475 +#: navalplanner-webapp/src/main/java/org/navalplanner/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?" @@ -1090,25 +1103,21 @@ msgstr "Nombre de la empresa" msgid "Limiting resource allocation" msgstr "Asignación de recursos limitantes" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:948 -msgid "{0}" -msgstr "{0}" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:462 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:463 msgid "Split new assignment" msgstr "Dividir nueva asignación" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:187 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:231 -msgid "Expiry date" -msgstr "Fecha de vencimiento" - -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:67 -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:52 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:53 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:68 msgid "Pagination" msgstr "Paginación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:336 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:265 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:286 +msgid "Expiry date" +msgstr "Fecha de vencimiento" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:337 msgid "" "The operation does not perform because the task has progress reports that is " "spread associated with this quality form" @@ -1116,67 +1125,71 @@ msgstr "" "La operación no se puede llevar a cabo porque la tarea tiene marcado como " "progreso progagado el asociado con el formulario de calidad" -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:74 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:82 msgid "Change scenario" msgstr "Cambiar escenario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:343 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:344 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?" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloModel.java:83 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:68 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloModel.java:84 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:69 msgid "Critical path" msgstr "Camino crítico" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:41 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:71 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:38 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:42 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:83 msgid "Categories" msgstr "Categorías" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:45 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:180 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:39 +#: navalplanner-webapp/src/main/webapp/common/error.zul:44 +msgid "Status code:" +msgstr "Código de estado:" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:46 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:181 msgid "Project Details" msgstr "Detalles de proyecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:93 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:94 msgid "Create Criterion Type" msgstr "Crear tipo de criterio" -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:225 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:117 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:202 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:225 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163 -#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:47 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185 msgid " to go to output directly" msgstr " ir a la salida directamente" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:167 msgid "Add new hours group" msgstr "Añadir nuevo grupo de horas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:218 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:219 msgid "Criteria: {0} " msgstr "Criterios: {0} " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:384 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:109 -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:62 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:44 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:84 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:385 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:110 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:63 msgid "Percentage" msgstr "Porcentaje" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:136 msgid "Updated" msgstr "Actualizado" @@ -1184,7 +1197,7 @@ msgstr "Actualizado" msgid "Company logo URL" msgstr "URL del logo de la empresa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:130 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:131 msgid "No worker selected" msgstr "Ningún trabajador seleccionado" @@ -1192,29 +1205,29 @@ msgstr "Ningún trabajador seleccionado" msgid "Number of digits" msgstr "Número de dígitos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1628 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1651 msgid "Task not found" msgstr "Tarea no encontrada" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:38 -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:38 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:39 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:39 msgid "Total capability" msgstr "Capacidad total" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:663 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:684 msgid "It not could remove the task " msgstr "No se pudo borrar la tarea" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:232 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:217 msgid "Problems connecting with client web service" msgstr "Problemas al conectar con el servicio web cliente" -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:20 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:21 msgid "NavalPlan: User access" msgstr "NavalPlan: Acceso de usuarios" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:120 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:142 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:154 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:183 msgid "Exception Type" msgstr "Tipo de excepción" @@ -1222,41 +1235,45 @@ msgstr "Tipo de excepción" msgid "NavalPlan: Materials" msgstr "NavalPlan: Materiales" -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:21 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:22 msgid "Profiles List" msgstr "Lista de Perfiles" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:277 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:278 msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "" "{0} de la categoría {1} y {2} de la categoría {3} tienen el mismo código" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:236 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:853 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:240 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:277 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:875 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:566 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:67 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:63 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:50 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:567 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:896 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:322 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:64 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:68 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:51 msgid "Labels" msgstr "Etiquetas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:273 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:139 +msgid "is not supported for its use with NavalPlan." +msgstr "no está soportado para su uso con NavalPlan." + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:318 msgid "Data Types" msgstr "Tipos de datos" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:154 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:67 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:155 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68 msgid "Total hours" msgstr "Total de horas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:339 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:343 msgid "Reassigning {0} projects" msgstr "Reasignando {0} proyectos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:83 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:84 msgid "Create Work Hours Type" msgstr "Crear tipo de horas de trabajo" @@ -1264,17 +1281,17 @@ msgstr "Crear tipo de horas de trabajo" msgid "Filter by task status" msgstr "Filtrar por estado de tarea" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:471 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:422 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:423 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:533 msgid "Select date:" msgstr "Seleccione fecha:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:561 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1032 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:636 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1106 msgid "You should select a end date for the exception" msgstr "Debe seleccionar una fecha de fin para la excepción" -#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:33 +#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:34 msgid "Please try it again." msgstr "Por favor, inténtelo de nuevo." @@ -1282,133 +1299,129 @@ msgstr "Por favor, inténtelo de nuevo." msgid "Company code" msgstr "Código de la empresa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:109 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:110 msgid "Unknown attribute '{0}' in class {1}" msgstr "Atributo desconocido '{0}' en la clase {1}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:704 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:714 msgid "NON LIMITING RESOURCE" msgstr "RECURSO NO LIMITANTE" -#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:22 msgid "NavalPlan: Workers" msgstr "NavalPlan: Trabajadores" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:123 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:125 msgid "as late as possible" msgstr "tan tarde como sea posible" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:88 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:117 msgid "Activation periods" msgstr "Períodos de activación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:388 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:389 msgid "Passed" msgstr "Pasado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:87 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:127 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:174 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:88 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:175 msgid "already assigned" msgstr "ya asignado" -#: navalplanner-webapp/src/main/webapp/planner/order.zul:154 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:33 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:30 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:119 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:130 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:155 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:68 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:131 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:119 msgid "Calendar" msgstr "Calendario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:92 -msgid "{0}h" -msgstr "{0}h" - -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:30 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:55 -msgid "Read" -msgstr "Leer" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:255 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:300 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:99 msgid "Resources" msgstr "Recursos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:152 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:56 +msgid "Read" +msgstr "Leer" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:153 msgid "Source and destination scenarios should be different" msgstr "Los escenarios de origen y destino deben ser diferentes" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:229 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:230 msgid "CriterionType and its criteria saved" msgstr "Tipo de criterio y sus criterios guardados" -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:70 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:137 +msgid "The browser you are using" +msgstr "El navegador que está usando" + +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:78 msgid "scenario" msgstr "escenario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:94 -msgid " {0}m" -msgstr " {0}m" - -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:40 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:28 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:29 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:50 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:49 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:209 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:41 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:248 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:29 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:50 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:51 msgid "to" msgstr "a" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:178 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:197 msgid "Error on removing typeOfWorkHours: " msgstr "Error al borrar tipo de horas de trabajo: " -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:111 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:112 msgid "worker's first name not specified" msgstr "nombre del trabajador no especificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:275 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:276 msgid "date not specified" msgstr "fecha no especificada" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:94 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:95 msgid "Select type :" msgstr "Seleccione tipo :" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:258 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:268 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:238 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:259 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:269 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:263 msgid "Projects Planning" msgstr "Planificación de proyectos" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:73 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:37 msgid "Shrink to fit page width" msgstr "Reducir para ajustar al ancho de página" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:66 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:67 msgid "Last name" msgstr "Apellidos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:549 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:322 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:348 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:551 msgid "Remove" msgstr "Borrar" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:253 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:254 msgid "cost category name not specified" msgstr "nombre de la categoría de coste no especificado" -#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:22 msgid "NavalPlan: Virtual Workers Groups" msgstr "NavalPlan: Grupos de trabajadores virtuales" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:131 msgid "SPI" msgstr "SPI" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:217 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:244 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:245 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:218 msgid "" "Start date is not valid, the new start date must be previous the current " "start date" @@ -1416,15 +1429,15 @@ msgstr "" "La fecha de inicio no es válida, la fecha de inicio nueva debe ser anterior " "a la fecha de inicio actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:389 +#: navalplanner-webapp/src/main/java/org/navalplanner/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" -#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:33 +#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:34 msgid "Create New Project" msgstr "Crear proyecto nuevo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1337 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1357 msgid "Stretches list" msgstr "Lista de tramos" @@ -1432,41 +1445,41 @@ msgstr "Lista de tramos" msgid "Enable scenarios module" msgstr "Habilitar módulo de escenarios" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:59 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:60 msgid "Zoom" msgstr "Zoom" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:520 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:135 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:80 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:104 -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:37 -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:40 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:129 -#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:39 -#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:40 -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:94 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:88 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:519 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:106 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:92 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:241 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:210 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:36 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:40 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:169 -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:37 -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:88 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:95 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:117 -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:38 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:129 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:76 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:45 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:50 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:39 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:130 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:46 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:52 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:130 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:38 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:42 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:54 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:185 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:37 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:41 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:211 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:38 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:41 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:135 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:80 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:241 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:80 msgid "Save" msgstr "Guardar" @@ -1474,51 +1487,56 @@ msgstr "Guardar" msgid "Material categories" msgstr "Categorías de materiales" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:131 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:61 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:33 +msgid "Standard Effort" +msgstr "Esfuerzo estándar" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:133 msgid "Pending update" msgstr "Actualización pendiente" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:67 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:59 msgid "End date:" msgstr "Fecha de fin:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:159 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:160 msgid "Criterion previously selected" msgstr "Criterio seleccionado previamente" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:50 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:51 msgid "Users authorization" msgstr "Autorización de usuarios" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:172 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:177 msgid "Problems connecting with subcontractor web service" msgstr "Problemas conectando con el servicio web subcontratista" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:43 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:44 msgid "Assigned load" msgstr "Carga asignada" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:76 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:68 msgid "Filter by workers" msgstr "Filtrar por trabajadores" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:116 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:139 msgid "End Date" msgstr "Fecha de fin" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:368 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:374 msgid "Some allocations needed" msgstr "Se necesitan algunas asignaciones" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:129 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82 msgid "Resources Per Day" msgstr "Recursos por día" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:215 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:216 msgid "ResourceType must be not-null" msgstr "El tipo de recurso no puede ser nulo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:94 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:95 msgid "" "Estimated end date for the task (press enter in textbox to open calendar " "popup or type in date directly)" @@ -1526,94 +1544,93 @@ msgstr "" "Fecha de fin estimada para la tarea (presione enter en el cuadro de texto " "para abrir el calendario o escriba la fecha directamente)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:280 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:281 msgid "Expand/Collapse all" msgstr "Expandir/Plegar todo" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:31 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:32 msgid "Overload due to current project" msgstr "Sobrecarga debido al proyecto actual" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:867 +msgid "Move down" +msgstr "Mover abajo" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:116 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:112 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:137 +msgid "Please, select a project" +msgstr "Por favor, seleccione un proyecto" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:841 msgid "Name: {0}" msgstr "Nombre: {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:866 -msgid "Move down" -msgstr "Mover abajo" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:115 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:111 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:136 -msgid "Please, select a project" -msgstr "Por favor, seleccione un proyecto" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:79 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:69 msgid "September" msgstr "Septiembre" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:26 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:27 msgid "Report structure" msgstr "Estructura del parte" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:87 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:88 msgid "password not specified" msgstr "contraseña no especificada" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:58 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:41 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:117 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:59 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:42 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:118 msgid "General data" msgstr "Datos generales" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:126 msgid "BAC" msgstr "BAC" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:428 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:399 msgid "Calculate Number of Hours" msgstr "Calcular número de horas" -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:37 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:80 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81 msgid "Assign" msgstr "Asignar" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java:129 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java:130 msgid "missing code in a criterion" msgstr "falta código en un criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1278 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1297 msgid "Create Template" msgstr "Crear plantilla" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:22 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:22 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:22 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:23 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:23 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:23 msgid "NavalPlan: Work Reports" msgstr "NavalPlan: Partes de trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:114 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:115 msgid "Edit Company" msgstr "Editar empresa" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:78 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:114 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:67 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:60 msgid "Advanced search" msgstr "Búsqueda avanzada" +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:86 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:78 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:99 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:116 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:78 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:107 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:78 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:86 msgid "Filter by labels" msgstr "Filtrar por etiquetas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:669 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:672 msgid "" "IMPORTANT: Don't forget to communicate to subcontractor that his contract " "has been cancelled" @@ -1621,7 +1638,7 @@ msgstr "" "IMPORTANTE: No olvidar comunicar al subcontratista que su contrato ha sido " "cancelado" -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:37 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:38 msgid "MonteCarlo chart" msgstr "Diagrama de Montecarlo" @@ -1629,267 +1646,277 @@ msgstr "Diagrama de Montecarlo" msgid "NavalPlan: Hours Worked Per Resource" msgstr "NavalPlan: Horas Trabajadas Por Recurso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:126 msgid "Schedule Variance" msgstr "Desviación en planificación" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:409 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:410 msgid "Service does not manage resource of type: {0}" msgstr "El servicio no gestiona recursos del tipo: {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:601 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:639 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:670 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1290 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:190 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:185 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:442 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1302 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:604 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:642 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:673 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:191 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:210 msgid "Warning" msgstr "Advertencia" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:34 -#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:30 msgid "Select parent calendar" msgstr "Seleccionar el calendario padre" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:95 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:167 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:462 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:525 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:96 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:168 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:463 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:526 msgid "There is no task with this code" msgstr "No hay ninguna tarea con este código " -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:292 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:214 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:433 +msgid "The type of hours cannot be null" +msgstr "El tipo de horas no puede ser nulo" + +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:297 msgid "criterion satisfaction with end date less than start date" msgstr "el criterio satisfecho tiene fecha de fin anterior a la de inicio" -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:230 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:189 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:214 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:197 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:122 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:170 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:112 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:206 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:230 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:167 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:48 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:189 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49 msgid "Show" msgstr "Mostrar" -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:75 -msgid "Assignment Type" -msgstr "Tipo de asignación" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:57 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:58 msgid "Duration (days)" msgstr "Duración (días)" -#: navalplanner-webapp/src/main/webapp/planner/index.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:22 -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/resources_use.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:21 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:21 -#: navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:71 +msgid "Assignment Type" +msgstr "Tipo de asignación" + +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/index.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/resources_use.zul:22 +#: navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul:22 msgid "NavalPlan: Scheduling" msgstr "NavalPlan: Planificación" -#: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:28 +#: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:29 msgid "Back to log in" msgstr "Volver a iniciar sesión" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:480 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:482 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:481 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:483 msgid "Error on splitting" msgstr "Error al dividir" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:76 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:31 msgid "Planned start :" msgstr "Inicio planificado :" -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46 -msgid "Company" -msgstr "Empresa" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:65 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:66 msgid "Node without children" msgstr "Nodo sin hijos" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:117 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47 +msgid "Company" +msgstr "Empresa" + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:118 msgid "There is no label with this code " msgstr "No hay ninguna etiqueta con este código " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:209 -msgid "Task: {0} " -msgstr "Tarea: {0} " - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:136 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:138 msgid "Profile saved" msgstr "Perfil guardado" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:210 +msgid "Task: {0} " +msgstr "Tarea: {0} " + #: navalplanner-webapp/src/main/webapp/planner/editTask.zul:65 msgid "Task properties" msgstr "Propiedades de la tarea" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:74 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:75 msgid "There is no type of work report with this code" msgstr "No hay ningún parte de trabajo con este código" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:55 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:56 msgid "Sum of direct imputed hours" msgstr "Suma de horas imputadas directamente" -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:34 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:35 msgid "Surname" msgstr "Apellidos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1289 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1301 msgid "You need to select some function to configure" msgstr "Necesita seleccionar alguna función para configurar" -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:21 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:22 msgid "Exception Day Types List" msgstr "Lista de tipos de día de excepción" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:374 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:375 msgid "the name must be not null or not empty" msgstr "el nombre no puede ser nulo o vacío" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:392 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:742 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:48 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:110 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:393 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:741 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:31 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:76 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:156 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:66 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:67 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:115 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:111 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:77 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:68 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:131 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:67 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:157 msgid "Date" msgstr "Fecha" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:40 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:363 +msgid "there must be {0} effort instead of {1}" +msgstr "debe haber {0} esfuerzo en lugar de {1}" + +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:41 msgid "Add From Template" msgstr "Añadir a partir de plantilla" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:600 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:638 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:603 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:641 msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "Los recursos asignados para esta tarea serán borrados. ¿Está seguro?" -#: navalplanner-webapp/src/main/webapp/excetiondays/exceptionDays.zul:21 +#: navalplanner-webapp/src/main/webapp/excetiondays/exceptionDays.zul:22 msgid "NavalPlan: Exception Days" msgstr "NavalPlan: Días de excepción" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:640 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:641 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." -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:55 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:45 msgid "Filter by month" msgstr "Filtrar por mes" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:525 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:361 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:351 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:320 +msgid "The criterion and its type cannot be null" +msgstr "El criterio y su tipo no pueden ser nulos" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:526 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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:350 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:360 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:319 -msgid "The criterion and its type cannot be null" -msgstr "El criterio y su tipo no pueden ser nulos" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:212 -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" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:77 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:67 msgid "July" msgstr "Julio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:517 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:220 +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" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:543 msgid "( max: {0} )" msgstr "( máx: {0} )" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:208 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:218 msgid "Error on removing element: " msgstr "Error al borrar elemento: " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:41 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:71 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:61 msgid "January" msgstr "Enero" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:63 -msgid "Cannot calculate charts for current data" -msgstr "No se pueden calcular gráficos para los datos actuales" - -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:53 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:54 msgid "Select queue" msgstr "Seleccionar cola" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:513 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:64 +msgid "Cannot calculate charts for current data" +msgstr "No se pueden calcular gráficos para los datos actuales" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:582 msgid "The cost category had already been removed." msgstr "La categoría de coste ya había sido borrada." -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:47 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:48 msgid "Work description" msgstr "Descripción del trabajo" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:64 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:59 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:63 msgid "Split assignment" msgstr "Dividir asignación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:117 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:118 msgid "You can not remove the default scenario called \"{0}\"" msgstr "No se puede borrar el escenario por defecto, llamado \"{0}\"" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:546 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:572 msgid "There are not any assigned progress to current task" msgstr "No hay ningún progreso asignado a la tarea actual" -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:109 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:110 msgid "Down" msgstr "Abajo" -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:224 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:184 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:209 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:192 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:116 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:165 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:106 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:201 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:224 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:162 -#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:46 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:184 msgid "direct link" msgstr "enlace directo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:35 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:29 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:933 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:934 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:36 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:48 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:89 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:47 msgid "Label" msgstr "Etiqueta" -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:36 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:37 msgid "Create Scenario" msgstr "Crear escenario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:833 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:834 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" @@ -1899,73 +1926,76 @@ msgstr "" msgid "Association with roles" msgstr "Asociación con roles" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:383 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:384 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" -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:29 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:30 msgid "Quality forms" msgstr "Formularios de calidad" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:143 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:144 msgid "Hours group" msgstr "Grupo de horas" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:95 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:29 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:30 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:96 msgid "Days from Beginning to Deadline" msgstr "Días desde el comienzo hasta la fecha límite" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:127 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:128 msgid "Estimate At Completion" msgstr "Estimación de coste total actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:322 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:175 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:199 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:372 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:421 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:194 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:373 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:200 msgid "Delete item. Are you sure?" msgstr "Borrar elemento. ¿Está seguro?" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:101 +#: navalplanner-business/src/main/java/org/navalplanner/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" +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:178 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:92 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:167 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:189 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:208 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:170 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:197 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:167 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:178 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:102 -#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:35 msgid "Output format:" msgstr "Formato de salida:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:44 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:956 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1030 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:45 msgid "Direct" msgstr "Directo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:819 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:51 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:818 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:189 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:268 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:289 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:52 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:83 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:34 msgid "Op." msgstr "Op." -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:43 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:44 msgid "Pessimistic" msgstr "Pesimista" -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:55 #: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:55 msgid "Reference date:" msgstr "Fecha de referencia:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:468 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:471 msgid "Limiting resource assignation" msgstr "Asignación de recursos limitantes" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1234 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1235 msgid "" "This progress can not be removed, because it is spread. It is necessary to " "select another progress as spread." @@ -1973,20 +2003,20 @@ msgstr "" "Este progreso no se puede eliminar porque es propagado. Es necesario " "seleccionar otro progreso como propagado." -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:87 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:116 msgid "Work week" msgstr "Semana de trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:127 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:128 msgid "You will lose the changes. Are you sure?" msgstr "Se perderán los cambios. ¿Está seguro?" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:28 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:45 msgid "Company ID" msgstr "NIF" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:184 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:192 msgid "Unit type name cannot be empty" msgstr "El nombre del tipo de unidad no puede ser vacío" @@ -1994,149 +2024,147 @@ msgstr "El nombre del tipo de unidad no puede ser vacío" msgid "Entity sequences" msgstr "Secuencias de entidad" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:90 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:91 msgid "Delay from beginning (days)" msgstr "Retraso desde el comienzo (en días)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:303 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:319 msgid "Resource cannot be null" msgstr "El recurso no puede ser nulo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:533 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:505 msgid "Total Hours" msgstr "Horas totales" -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:36 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:37 msgid "Create Progress Type" msgstr "Crear tipo de progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:129 msgid "Confirm cancel" msgstr "Confirmar cancelación" -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:61 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:62 msgid "Label list" msgstr "Lista de etiquetas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:290 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:335 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 msgid "Work And Progress Per Task" msgstr "Trabajo y progreso por tarea" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:39 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:40 msgid "WBS (tasks)" msgstr "EDT (tareas)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:90 -msgid "start not earlier than" -msgstr "empezar no antes de" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:187 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:469 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:483 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:149 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:858 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:206 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:261 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1227 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:298 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:132 -msgid "Error on showing removing element: " -msgstr "Error al mostrar el elemento a borrar: " - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:689 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:690 msgid "Deleting sequence" msgstr "Borrando secuencia" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:133 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:538 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:552 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:150 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:299 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:423 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:860 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:895 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:207 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:262 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1250 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:227 +msgid "Error on showing removing element: " +msgstr "Error al mostrar el elemento a borrar: " + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:92 +msgid "start not earlier than" +msgstr "empezar no antes de" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:130 msgid "AS_LATE_AS_POSSIBLE" msgstr "TAN_TARDE_COMO_SEA_POSIBLE" -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:79 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:87 msgid "Select scenario" msgstr "Seleccionar escenario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:135 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:218 msgid "Create Label Type" msgstr "Crear tipo de etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:232 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:233 msgid "missing work report code in a work report" msgstr "falta código en un parte de trabajo" -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:35 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:36 msgid "Create Work Report Type" msgstr "Crear tipo de parte de trabajo" -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51 msgid "Criterion requirement" msgstr "Criterios requeridos" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:34 -msgid "PDF" -msgstr "PDF" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1170 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1246 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." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:328 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:148 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:153 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:329 msgid "Scheduling saved" msgstr "Planificación guardada" -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:26 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:68 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:196 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:155 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:27 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:171 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:197 msgid "Add new row" msgstr "Añadir nueva fila" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:781 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:783 msgid "incorrect initialization of the progress assignment controller." msgstr "inicialización incorrecta del controlador de asignación de progreso." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:487 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:488 msgid "Move" msgstr "Mover" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:224 msgid "missing code in the resource calendar" msgstr "falta código en un calendario de recursos" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:33 -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:28 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:29 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:34 msgid "Overload" msgstr "Sobrecarga" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:67 -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:29 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:30 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:68 msgid "Assignment log" msgstr "Histórico de asignación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyCaptTimeout.java:44 -msgid "CutycaptTimeout thread exception" -msgstr "Excepción de thread CutycaptTimeout" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:280 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:21 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:325 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:22 msgid "Work Report Models" msgstr "Modelos de partes de trabajo" -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyCaptTimeout.java:45 +msgid "CutycaptTimeout thread exception" +msgstr "Excepción de thread CutycaptTimeout" + +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:48 msgid "Date last progress measurement" msgstr "Fecha de la última medida de progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:102 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:103 msgid "Deadline (days since beggining project)" msgstr "Fecha límite (días desde el inicio del proyecto)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:404 +#: navalplanner-webapp/src/main/java/org/navalplanner/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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:359 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:385 msgid "" "Calendar cannot be removed because it still has children. Some other " "calendar is derived from this one." @@ -2144,107 +2172,106 @@ msgstr "" "El calendario no se puede borrar porque aún tiene hijos. Algún otro " "calendario deriva de este." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:917 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:918 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" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:443 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:444 msgid "criterion type name is already being used" msgstr "el nombre de tipo de criterio está siendo usado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:310 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:326 msgid "Task code cannot be null" msgstr "El código de la tarea no puede ser nulo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:544 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:570 msgid "It is not allowed to consolidate progress." msgstr "No se permite consolidar progreso." -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:31 msgid "Create Task" msgstr "Crear tarea" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:97 +#: navalplanner-webapp/src/main/java/org/navalplanner/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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:139 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:151 msgid "Edit Cost Category" msgstr "Editar categoría de coste" -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:82 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:112 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:26 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:58 -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:27 -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:43 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:65 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:31 -msgid "Actions" -msgstr "Acciones" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:26 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27 msgid "External company" msgstr "Empresa externa" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:86 -msgid "Exceptions" -msgstr "Excepciones" +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:66 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:29 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:27 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:82 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:112 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:58 +msgid "Actions" +msgstr "Acciones" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:71 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:80 msgid "Start hour" msgstr "Hora de inicio" -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:60 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:115 +msgid "Exceptions" +msgstr "Excepciones" + +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32 msgid "Over assignable" msgstr "Sobreasignable" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:225 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:139 +msgid "Assign materials" +msgstr "Asignar materiales" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:226 msgid "format filters are not valid" msgstr "los filtros de formato no son válidos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:50 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:71 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:36 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:37 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:72 msgid "ID" msgstr "NIF" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:350 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:180 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:419 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:181 msgid "The init date cannot be empty" msgstr "La fecha de inicio no puede ser vacía" +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:28 +msgid "Is administrator" +msgstr "Es administrador" + #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:88 msgid "Our company password" msgstr "Contraseña de nuestra empresa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:274 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:133 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:171 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:129 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:170 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:275 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:130 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:171 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:172 msgid "This label has already been added." msgstr "Esta etiqueta ya ha sido añadida." -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:177 -msgid "Inh." -msgstr "Her." - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/IntegrationEntityModel.java:78 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceServiceREST.java:178 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/IntegrationEntityModel.java:79 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceServiceREST.java:179 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" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:46 -msgid "A2" -msgstr "A2" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:393 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:394 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_'." @@ -2252,55 +2279,59 @@ msgstr "" "El valor no es válido.\n" " El código no puede contener caracteres como '_'." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:619 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:625 msgid "Confirm deleting this machine. Are you sure?" msgstr "Confirmar el borrado de esta máquina. ¿Está seguro?" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:160 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:161 msgid "Hours Group" msgstr "Grupo de horas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:914 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:915 msgid "Unallocated name" msgstr "Nombre no asignado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:887 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:888 msgid "Move up" msgstr "Mover arriba" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:123 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 msgid "BCWP" msgstr "BCWP" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:42 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:43 msgid "Subcontract communication date" msgstr "Fecha de comunicación de la subcontratación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:125 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:128 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:280 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:237 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:309 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:281 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:129 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:132 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:262 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:354 msgid "Scheduling" msgstr "Planificación" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:125 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:126 msgid "Dependencies have priority" msgstr "Las dependencias tienen prioridad" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:126 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:206 +msgid "Unlimited" +msgstr "Ilimitado" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:127 msgid "Budget At Completion" msgstr "Total coste planificado" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:76 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:77 msgid "Assign Label" msgstr "Asignar etiqueta" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:73 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:74 msgid "Page up" msgstr "Página arriba" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:230 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:231 msgid "Create new project" msgstr "Crear nuevo proyecto" @@ -2309,138 +2340,141 @@ msgid "Work done from starting date:" msgstr "Trabajo realizado desde la fecha de inicio:" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:849 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:44 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:158 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:34 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:49 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:159 msgid "State" msgstr "Estado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:79 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:80 msgid "Must start after" msgstr "Debe empezar después" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1275 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1287 msgid "Confirm change" msgstr "Confirmar cambio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:863 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:865 msgid "You don't have permissions to edit this project" msgstr "No tiene permisos para editar este proyecto" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:37 -msgid "Single image" -msgstr "Imagen simple" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:102 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:104 msgid "Edit Profile" msgstr "Editar perfil" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:192 msgid "missing date in a calendar exception" msgstr "falta la fecha de una excepción de calendario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:524 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:213 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:432 +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" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:599 msgid "Exception" msgstr "Excepción" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:107 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:179 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:449 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:514 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:108 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:180 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:450 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:515 msgid "There is no resource with this ID" msgstr "No hay otro recurso con este NIF" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:191 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:194 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:192 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:196 msgid "Send" msgstr "Enviar" -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:95 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:103 msgid "user" msgstr "usuario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java:72 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java:53 msgid "New task" msgstr "Nueva tarea" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:115 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:125 msgid "The password for a new user cannot be empty" msgstr "La contraseña no puede ser vacía para un usuario nuevo" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:31 msgid "Associated user" msgstr "Usuario asociado" -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:27 msgid "Type name" msgstr "Nombre del tipo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/advances/AdvanceAssignmentPlanningCommand.java:68 -msgid "Progress assignment" -msgstr "Asignación de progreso" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:30 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:181 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:204 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:439 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:33 -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:26 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:182 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:205 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:31 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:440 msgid "All" msgstr "Todo" -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69 +msgid "Progress assignment" +msgstr "Asignación de progreso" + +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:40 msgid "Edit Progress Type" msgstr "Editar tipo de progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:456 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:459 msgid "Manual" msgstr "Manual" -#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:21 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:22 msgid "Calendars List" msgstr "Lista de calendarios" -#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:21 -msgid "Resources List" -msgstr "Lista de recursos" - -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:27 msgid "Receipt date" msgstr "Fecha de recepción" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:209 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:210 msgid "Cannot be higher than Ending date" msgstr "No puede ser mayor que la fecha de fin" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:236 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:292 msgid "Create activation period" msgstr "Crear período de activación" -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:21 -msgid "Workers List" -msgstr "Lista de trabajadores" - -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:31 msgid "Personal details" msgstr "Detalles personales" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:354 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:22 +msgid "Workers List" +msgstr "Lista de trabajadores" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:355 msgid "Delete project template. Are you sure?" msgstr "Borrar plantilla de proyecto. ¿Está seguro?" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:47 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:954 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1028 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:48 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:214 msgid "Inherited" msgstr "Heredado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:216 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:217 msgid "Criterion must be not-null" msgstr "El criterio no debe ser nulo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:525 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:255 +msgid "Worker" +msgstr "Trabajador" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:517 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:595 msgid "" "Cannot allocate selected element. There is not any queue that matches " "resource allocation criteria at any interval of time" @@ -2449,45 +2483,41 @@ msgstr "" "coincida con los criterios de asignación de recursos en ningún intervalo de " "tiempo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:254 -msgid "Worker" -msgstr "Trabajador" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:160 -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:254 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:161 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:299 msgid "criterion name not specified" msgstr "nombre del criterio no especificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:136 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 " -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:24 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:25 msgid "Manual allocation" msgstr "Asignación manual" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:28 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:29 msgid "External overload" msgstr "Sobrecarga externa" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:32 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:57 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:33 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:58 msgid "Authorize" msgstr "Autorizar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:258 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:47 +msgid "Recommended allocation" +msgstr "Asignación recomendada" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:303 msgid "Scenarios" msgstr "Escenarios" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:374 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:375 msgid "Materials saved" msgstr "Materiales guardados" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:55 -msgid "Quarter" -msgstr "Cuarto" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1248 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1249 msgid "" "This progress measurement can not be in current date, because it is " "consolidated. it is necessary to select other date." @@ -2495,115 +2525,115 @@ msgstr "" "Esta medida de progreso no puede estar en la fecha actual, porque está " "consolidada. Debe seleccionar otra fecha." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:699 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:704 msgid "Other projects" msgstr "Otros proyectos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:163 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:164 msgid "At least one {0} sequence must be active" msgstr "Al menos una secuencia de {0} debe estar activa" +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:26 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:111 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:25 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:41 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:65 msgid "Profile name" msgstr "Nombre del perfil" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:241 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:248 msgid "Could open generated PDF" msgstr "No se pudo abrir el PDF generado" -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:106 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:107 msgid "Disable Delete" msgstr "Deshabilitar borrado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:143 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:144 msgid "You should select a source scenario" msgstr "Debe seleccionar un escenario de origen" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:158 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:159 msgid "At least one {0} sequence is needed" msgstr "Se necesita al menos una secuencia de {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:291 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:336 #: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 msgid "Estimated/Planned Hours Per Task" msgstr "Horas por tarea estimadas/planificadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:67 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:68 msgid "Assigned" msgstr "Asignado" -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:45 msgid "Details" msgstr "Detalles" -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 msgid "Communication" msgstr "Comunicación" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:35 msgid "More options" msgstr "Más opciones" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:184 -msgid "Company saved" -msgstr "Empresa guardada" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:234 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:174 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:219 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:179 msgid "Error: {0}" msgstr "Error: {0}" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:185 +msgid "Company saved" +msgstr "Empresa guardada" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/TreeElementOperationsController.java:240 msgid "Confirm create template" msgstr "Confirmar la creación de la plantilla" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:185 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:261 msgid "Parent" msgstr "Padre" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:90 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:91 msgid "Earliest date" msgstr "Fecha más temprana" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:126 msgid "Type of work hours saved" msgstr "Tipo de horas de trabajo guardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:112 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:239 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:45 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:113 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:269 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:46 msgid "Projects" msgstr "Proyectos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:149 -msgid "Create Quality Form" -msgstr "Crear formulario de calidad" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java:63 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java:64 msgid "Not found converter for {0}" msgstr "No se encontró un conversor para {0}" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:69 -msgid "Material assignments" -msgstr "Asignaciones de materiales" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:150 +msgid "Create Quality Form" +msgstr "Crear formulario de calidad" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:103 msgid "start in fixed date" msgstr "comenzar en fecha fija" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:82 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:70 +msgid "Material assignments" +msgstr "Asignaciones de materiales" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:45 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:72 msgid "December" msgstr "Diciembre" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:921 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:922 msgid "Text field" msgstr "Campo de texto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:120 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:122 msgid "" "Value is not valid, the Precision value must be less than the defalt max " "value." @@ -2611,11 +2641,11 @@ msgstr "" "El valor no es válido, el valor de precisión debe ser menor que el valor " "máximo por defecto." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:180 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:181 msgid "Question" msgstr "Pregunta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1245 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1246 msgid "" "This progress measurement can not be changed or removed, because it is " "consolidated. It is needed to remove its consolidation." @@ -2623,19 +2653,23 @@ msgstr "" "Esta medida de progreso no se puede cambiar o borrar, porque está " "consolidada. Se requiere borrar su consolidación." -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:215 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:222 msgid "Create new work week" msgstr "Crear nueva semana de trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:703 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:713 msgid "LIMITING RESOURCE" msgstr "RECURSO LIMITANTE" -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:42 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:43 msgid "Subcontratation" msgstr "Subcontratación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:534 +msgid "{0} cannot be fulfilled" +msgstr "No se puede cumplir {0}" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:198 msgid "" "The meausure name is not valid. There is another unit type with the same " "measure name" @@ -2643,15 +2677,15 @@ msgstr "" "El nombre de la medida no es válido. Hay otro tipo de unidad con el mismo " "nombre de medida" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:115 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:68 msgid "Extended view" msgstr "Vista expandida" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:33 msgid "Work record" msgstr "Registro de trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:115 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:116 msgid "Error setting up edition form." msgstr "Error preparando el formulario de edición." @@ -2660,66 +2694,72 @@ msgstr "Error preparando el formulario de edición." msgid "Output format" msgstr "Formato de salida" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:81 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:44 msgid "Print" msgstr "Imprimir" -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:21 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:22 msgid "NavalPlan: Calendars" msgstr "NavalPlan: Calendarios" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:178 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:179 msgid "{0} not found type for criterion " msgstr "{0} no encontrado tipo para criterio " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:394 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:412 msgid "Hours cannot be null" msgstr "Las horas no pueden ser nulas" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:68 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:69 msgid "Page down" msgstr "Página abajo" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:484 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:485 msgid "resource type does not allow enabled criteria" msgstr "el tipo de recurso no permite criterios habilitados" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:51 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:134 -#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:49 -#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:81 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:84 -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:82 -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:40 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:71 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:134 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:169 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:139 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:84 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:110 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:133 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:100 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:92 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:48 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:22 +#: navalplanner-webapp/src/main/webapp/common/error.zul:21 +msgid "NavalPlan: Runtime Error" +msgstr "NavalPlan: Error de ejecución" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:52 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:112 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:77 -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:91 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:243 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:92 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:46 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:101 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:41 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:136 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:49 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:55 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:34 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:134 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:40 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:44 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:85 +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:81 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:41 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:72 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:135 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:170 +#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:50 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:45 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:81 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:216 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:38 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:42 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:175 -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:39 -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:43 -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:40 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:135 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:82 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 -#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:33 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:47 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:52 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:141 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:191 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:39 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:43 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:217 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:139 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:84 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:243 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:99 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:86 msgid "Cancel" msgstr "Cancelar" @@ -2727,152 +2767,152 @@ msgstr "Cancelar" msgid "General user data" msgstr "Datos generales de usuario" -#: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:31 +#: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:32 msgid "Unschedule" msgstr "Quitar planificación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:201 msgid "Subcontracted task sent successfully" msgstr "Tarea subcontratada enviada con éxito" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:72 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:73 msgid "Accumulated hours chart" msgstr "Gráfico de horas acumuladas" -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:22 msgid "Machines List" msgstr "Lista de máquinas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:659 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:905 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:525 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:526 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:661 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:924 msgid "You don't have read access to this project" msgstr "No tiene acceso de lectura a este proyecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:129 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130 msgid "CPI" msgstr "CPI" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:179 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:180 msgid "" "Disable hierarchy will cause criteria tree to be flattened. Are you sure?" msgstr "" "Desactivar jerarquía provocará que se aplane el árbol de criterios. ¿Está " "seguro?" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 -#: navalplanner-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:37 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:29 -msgid "Units" -msgstr "Unidades" - +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:45 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:52 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:53 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:47 msgid "Dates" msgstr "Fechas" -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:44 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:38 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:28 +msgid "Units" +msgstr "Unidades" + +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:45 msgid "Create Calendar" msgstr "Crear calendario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:131 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:185 msgid "At least one stretch is needed" msgstr "Se necesita al menos un tramo" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:302 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:307 msgid "a day is not valid" msgstr "un día no es válido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesCommand.java:60 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesCommand.java:61 msgid "Task Properties" msgstr "Propiedades de la tarea" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:180 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:192 msgid "Cost category saved" msgstr "Categoría de coste guardada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:236 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:213 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:228 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:214 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:237 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:229 msgid "" "End date is not valid, the new end date must be greater than the start date" msgstr "" "Fecha de fin inválida, la fecha de fin nueva debe ser posterior a la fecha " "de inicio" -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:32 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:33 msgid "name" msgstr "nombre" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:168 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:170 msgid "Progress type saved" msgstr "Tipo de progreso guardado" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:71 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:72 msgid "Delete selected task" msgstr "Borrar tarea seleccionada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java:129 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java:130 msgid "{0} (max: {1})" msgstr "{0} (máx: {1})" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:458 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:459 msgid "end" msgstr "fin" -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:62 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:63 msgid "Log" msgstr "Diario" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:56 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:57 msgid "Authorizations" msgstr "Autorizaciones" -#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:35 -#: navalplanner-webapp/src/main/webapp/common/event_error.zul:28 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:49 +#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:36 msgid "Continue" msgstr "Continuar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java:120 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java:121 msgid "Edit task {0}" msgstr "Editar tarea {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:209 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:235 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:236 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:210 msgid "Start date cannot be null" msgstr "La fecha de inicio no puede ser nula" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:252 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:297 msgid "Subcontracting" msgstr "Subcontratación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:325 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:328 msgid "references" msgstr "referencias" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1283 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1284 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 " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java:53 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java:55 msgid "Generic" msgstr "Genérico" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:85 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:41 msgid "Planned workable days :" msgstr "Días laborables planificados :" -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:46 -msgid "Default max value" -msgstr "Valor máximo por defecto" - -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:36 msgid "Add criterion requirement" msgstr "Añadir criterio requerido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:878 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:47 +msgid "Default max value" +msgstr "Valor máximo por defecto" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:880 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 " @@ -2882,39 +2922,35 @@ msgstr "" "usando en algún parte de trabajo y el proyecto sólo existe en el escenario " "actual" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:85 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:86 msgid "Percentage of estimated budget hours / hours consumed" msgstr "Porcentaje de horas de presupuesto estimadas / horas consumidas" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:498 +msgid "Automatic" +msgstr "Automático" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionBandboxFinder.java:44 msgid "Criterion Name" msgstr "Nombre del criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:495 -msgid "Automatic" -msgstr "Automático" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:47 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:47 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:90 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:52 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:91 msgid "Task" msgstr "Tarea" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:80 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:35 msgid "Planned end :" msgstr "Fin planificado :" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64 -msgid "2010" -msgstr "2010" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:269 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:127 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:166 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:123 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:164 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:84 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:270 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:124 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:165 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:167 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:85 msgid "please, select a label" msgstr "por favor, seleccione una etiqueta" @@ -2922,54 +2958,53 @@ msgstr "por favor, seleccione una etiqueta" msgid "Add profile" msgstr "Añadir perfil" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:214 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:215 msgid "filter already exists" msgstr "el filtro ya existe" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:225 msgid "missing code in a calendar data version" msgstr "falta el código en los datos de versión de un calendario" -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:39 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:41 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:45 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:40 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:46 msgid "Criterion name" msgstr "Nombre del criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:130 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:131 msgid "values are not valid, the values must not be null" msgstr "los valores no son válidos, no deben ser nulos" -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:31 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:49 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:32 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:78 msgid "Task name" msgstr "Nombre de la tarea" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:127 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:128 msgid "cost assignment's resource not specified" msgstr "recurso de la asignación de coste no especificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:46 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:124 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:135 -#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java:72 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:126 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:51 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136 msgid "Project" msgstr "Proyecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:78 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:79 msgid "Unassigned" msgstr "No asignado" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:100 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:101 msgid "Add new criterion requirement" msgstr "Añadir nuevo criterio requerido" -#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:24 +#: navalplanner-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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:123 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 msgid "Budgeted Cost Work Performed" msgstr "Coste presupuestado del trabajo realizado" @@ -2977,21 +3012,35 @@ msgstr "Coste presupuestado del trabajo realizado" msgid "Work report" msgstr "Parte de trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:297 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:135 +msgid "Change the password" +msgstr "Cambiar la contraseña" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:302 msgid "the name must be not empty" msgstr "el nombre no puede ser vacío" -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:58 -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:26 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:86 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:27 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:58 msgid "Disabled" msgstr "Deshabilitado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:598 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:349 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:350 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:736 msgid "Earned value" msgstr "Valor ganado" +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:216 +msgid "Inherited from parent calendar" +msgstr "Heredado del calendario padre" + +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:146 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:184 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:210 +msgid "Normal Effort" +msgstr "Esfuerzo normal" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/TreeElementOperationsController.java:250 msgid "" "Templates can only be created out of existent tasks.You are trying to create " @@ -3002,11 +3051,15 @@ msgstr "" "intentando crear unha plantilla a partir de una tarea nueva.\n" "Por favor guarde su proyecto antes de continuar." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:91 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:137 +msgid "{0} reassignations finished" +msgstr "Finalizadas {0} reasignaciones" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:92 msgid "Edit Work Hours Type" msgstr "Editar tipo de horas de trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:42 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:43 msgid "From Today" msgstr "A partir de hoy" @@ -3015,135 +3068,141 @@ msgstr "A partir de hoy" msgid "{0} not supported yet" msgstr "{0} aún no soportado" -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:52 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:53 msgid "New entry" msgstr "Entrada nueva" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:215 -msgid "Some sequences to remove not existed" -msgstr "Algunas secuencias para borrar no existen" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:104 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:113 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:211 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:105 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:114 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:212 msgid "Resources Load" msgstr "Carga de recursos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:210 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:216 +msgid "Some sequences to remove not existed" +msgstr "Algunas secuencias para borrar no existen" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:211 msgid "Changes have been canceled" msgstr "Cambios cancelados" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:265 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:280 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:266 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:281 msgid "Machine saved" msgstr "Máquina guardada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:131 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:143 msgid "Create Cost Category" msgstr "Crear categoría de coste" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:73 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:63 msgid "March" msgstr "Marzo" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:103 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:104 msgid "Appropriative allocation" msgstr "Asignación apropiativa" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:31 msgid "Assigned criterion requirements" msgstr "Criterios requeridos asignados" +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:127 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:117 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:138 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:157 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:119 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:146 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:117 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:127 msgid "Filter by criteria" msgstr "Filtrar por criterios" -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:36 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:37 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43 msgid "Max value" msgstr "Valor máximo" -#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:21 +#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:22 msgid "Scenarios List" msgstr "Lista de escenarios" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:154 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:156 msgid "The name is not valid, the name must not be null " msgstr "El nombre no es válido, no debe ser nulo " -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:139 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:140 msgid "Hours to allocate" msgstr "Horas para asignar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:114 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:115 msgid "A category must be selected" msgstr "Debe seleccionar una categoría" -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:37 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:134 +msgid "Period" +msgstr "Periodo" + +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:38 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:47 msgid "Spread" msgstr "Propagación" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:93 msgid "Select start date" msgstr "Seleccionar fecha de inicio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:192 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:151 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:153 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:902 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:189 +msgid "Removed {0}" +msgstr "{0} borrado" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:188 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:214 msgid "Error on showing warning message removing typeOfWorkHours: " msgstr "" "Error al mostrar mensaje de advertencia borrando tipo de horas de trabajo: " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:187 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:152 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:883 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:150 -msgid "Removed {0}" -msgstr "{0} borrado" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:800 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:818 msgid "Confirm deleting this worker. Are you sure?" msgstr "Confirmar el borrado de este trabajador. ¿Está seguro?" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:61 -msgid "Group name" -msgstr "Nombre del grupo" - -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:63 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55 msgid "Start date:" msgstr "Fecha de inicio:" +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:62 +msgid "Group name" +msgstr "Nombre del grupo" + #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:81 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:57 msgid "Role name" msgstr "Nombre del rol" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:819 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:837 msgid "This worker was already removed by other user" msgstr "Este trabajador ya ha sido borrado por otro usuario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:678 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:475 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:476 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:816 msgid "h" msgstr "h" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:114 -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" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:612 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:611 msgid "Create Work Report" msgstr "Crear parte de trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:358 +#: navalplanner-webapp/src/main/java/org/navalplanner/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" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:359 msgid "Workable capacity for this period " msgstr "Capacidad de trabajo para este período " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java:158 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:218 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java:159 msgid "Cannot be null or empty" msgstr "No puede ser nulo o vacío" @@ -3151,61 +3210,57 @@ msgstr "No puede ser nulo o vacío" msgid "Cannot delete profile: it does not exist anymore" msgstr "No se puede borrar el perfil: ya no existe" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:224 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:225 msgid "Edit Machine" msgstr "Editar máquina" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java:99 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java:77 msgid "Add Milestone" msgstr "Añadir hito" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:119 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:120 msgid "Assign selected items" msgstr "Asignar elementos seleccionados" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:437 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:438 msgid "init" msgstr "inicio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1211 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1212 msgid "Add new progress measurement" msgstr "Añadir nueva medida de progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:541 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:528 msgid "Select for automatic queuing" msgstr "Seleccione para encolar automáticamente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:259 -msgid "Scenarios Management" -msgstr "Administración de escenarios" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:191 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:192 msgid "Project {0} transfered" msgstr "Proyecto {0} transferido" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:95 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:304 +msgid "Scenarios Management" +msgstr "Administración de escenarios" + +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:96 msgid "Create & Assign" msgstr "Crear y asignar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:131 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:141 msgid "Edit User" msgstr "Editar usuario" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:31 -msgid "Print layout" -msgstr "Salida de impresión" - -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:54 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:55 msgid "Maximum/minimum of the estimated hours" msgstr "Máximo/mínimo de las horas estimadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:678 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:754 msgid "D" msgstr "D" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:137 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:140 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:111 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:112 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:90 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:93 msgid "Consolidated" msgstr "Consolidado" @@ -3217,55 +3272,55 @@ msgstr "Tipos de partes de trabajo" msgid "MonteCarlo method" msgstr "Método de Montecarlo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:984 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1058 msgid "derived exception can not be removed" msgstr "la excepción derivada no se puede borrar" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:216 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:217 msgid "missing code in a material" msgstr "falta el código en un material" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:29 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:108 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:61 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:109 msgid "Customer" msgstr "Cliente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:811 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:74 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:810 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:86 msgid "Hours type" msgstr "Tipo de horas" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:155 -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:209 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:156 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:210 msgid "criterion type name not specified" msgstr "nombre del tipo de criterio no especificado" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:219 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:220 msgid "Add Exception" msgstr "Añadir excepción" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:404 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:426 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:450 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:405 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:427 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:451 msgid "cannot be empty" msgstr "no puede ser vacío" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:146 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:105 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:121 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:147 msgid "Heading Fields" msgstr "Campos de cabecera" -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:26 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:26 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:48 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:27 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:48 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:49 msgid "from" msgstr "desde" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1385 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1405 msgid "Sigmoid function" msgstr "Función sigmoide" @@ -3274,11 +3329,15 @@ msgstr "Función sigmoide" msgid "Progress type" msgstr "Tipo de progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:580 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:581 msgid "Task {0} : Project is incompatible type with {1}" msgstr "Tarea {0} : El proyecto tiene un tipo incompatible con {1}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:154 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:35 +msgid "Expand taskgroups" +msgstr "Expandir grupos de tareas" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:155 msgid "" "Time period contains non valid data. Ending data must be older than starting " "date" @@ -3286,113 +3345,33 @@ msgstr "" "El período de tiempo contiene datos inválidos. La fecha de fin debe ser " "mayor que la de inicio" -#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:41 +#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:42 msgid "Save Project" msgstr "Guardar proyecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:255 -msgid "A type must be selected" -msgstr "Debe seleccionar un tipo" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:317 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:323 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:318 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:324 msgid "Day is not valid" msgstr "El día no es válido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:553 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1024 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:628 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1098 msgid "You should select a start date for the exception" msgstr "Debe seleccionar una fecha de inicio para la excepción" -#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:71 +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:72 msgid "Help" msgstr "Ayuda" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:129 msgid "Variance At Completion" msgstr "Desviación al coste final" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:63 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:64 msgid "Exportation options" msgstr "Opciones de exportación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:87 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:521 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:966 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:51 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java:45 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:50 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ScenarioBandboxFinder.java:45 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:50 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:374 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:91 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:48 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:31 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:127 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:39 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:25 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:40 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:72 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:26 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:79 -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:47 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:26 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:33 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:30 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:51 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:106 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:54 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:34 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:26 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:40 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:24 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:138 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:179 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:100 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:141 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:97 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:126 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:166 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:98 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:108 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:149 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:98 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:50 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:51 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:71 -#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:35 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:27 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:108 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:33 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:49 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:26 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:41 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:131 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:155 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:66 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:76 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:30 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:49 -#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:26 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:58 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:40 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:81 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:35 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:48 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:29 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:26 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:37 -#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:26 -msgid "Name" -msgstr "Nombre" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:159 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:160 msgid "" "Could not save time period. Time period overlaps with another non-compatible " "time period" @@ -3400,57 +3379,133 @@ msgstr "" "No se pudo guardar el período de tiempo. El período se solapa con otro " "período de tiempo incompatible" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:161 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:88 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:977 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:493 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:375 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java:46 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:52 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ScenarioBandboxFinder.java:46 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:51 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:108 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:149 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:98 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:89 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:118 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:158 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:138 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:179 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:98 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:100 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:141 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:41 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:74 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:26 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:50 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:52 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:55 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:35 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:58 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:41 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:82 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:40 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:80 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:45 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:67 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:77 +#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:31 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:50 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:80 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:32 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:92 +#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:115 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:72 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:42 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:156 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:39 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:49 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:30 +msgid "Name" +msgstr "Nombre" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:162 msgid "Delete task" msgstr "Borrar tarea" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:68 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:69 msgid "Seconds" msgstr "Segundos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:107 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:108 msgid "please, select an item" msgstr "por favor, seleccione un elemento" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:175 -msgid "Day of week" -msgstr "Día de la semana" - -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:21 -msgid "Companies List" -msgstr "Lista de empresas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:374 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:392 msgid "Time Start cannot be null" msgstr "La hora de inicio no puede ser nula" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1360 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:22 +msgid "Companies List" +msgstr "Lista de empresas" + +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:208 +msgid "Day of week" +msgstr "Día de la semana" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1380 msgid "Stretches with Interpolation" msgstr "Tramos con interpolación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:287 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:49 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:332 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:41 msgid "Hours Worked Per Resource" msgstr "Horas trabajadas por recurso" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java:145 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java:146 msgid "The end date cannot be before the init date" msgstr "La fecha de fin no puede ser anterior a la fecha de inicio" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:144 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:145 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" -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:62 -msgid "Maximum/minimum of the worked hours" -msgstr "Máximo/mínimo de las horas trabajadas" - -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:34 -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:25 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:35 msgid "Category name" msgstr "Nombre de la categoría" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:765 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:63 +msgid "Maximum/minimum of the worked hours" +msgstr "Máximo/mínimo de las horas trabajadas" + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:766 msgid "Not the same material, impossible to update" msgstr "No es el mismo material, imposible actualizar" @@ -3458,173 +3513,172 @@ msgstr "No es el mismo material, imposible actualizar" msgid "NavalPlan: Work And Progress Per Task" msgstr "NavalPlan: trabajo y progreso por tarea" -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:56 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:64 msgid "Main menu" msgstr "Menú principal" -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:21 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:22 msgid "NavalPlan: Progress" msgstr "NavalPlan: Progreso" -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:30 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:31 msgid "MonteCarlo" msgstr "Montecarlo" -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:65 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:49 msgid "Duration" msgstr "Duración" -#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:37 +#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:38 msgid "Create From Template" msgstr "Crear a partir de plantilla" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:380 +#: navalplanner-webapp/src/main/java/org/navalplanner/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." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:149 -#: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:150 +#: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:29 msgid "Schedule" msgstr "Planificar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:163 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:35 +#: navalplanner-webapp/src/main/webapp/common/error.zul:40 +msgid "Exception type:" +msgstr "Tipo de excepción:" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:164 msgid "Unexpected: {0}" msgstr "Inesperado: {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:97 -msgid " {0}s" -msgstr " {0}s" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:112 +msgid "s" +msgstr "s" -#: navalplanner-webapp/src/main/webapp/planner/main.zul:60 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:61 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:50 msgid "Notes" msgstr "Notas" -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:20 -msgid "NavalPlan: Units" -msgstr "NavalPlan: Unidades" - -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:22 -msgid "NavalPlan: Transfer Projects Between Scenarios" -msgstr "NavalPlan: transferir proyectos entre escenarios" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:224 msgid "Connect" msgstr "Conectar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:220 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:21 +msgid "NavalPlan: Units" +msgstr "NavalPlan: Unidades" + +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:23 +msgid "NavalPlan: Transfer Projects Between Scenarios" +msgstr "NavalPlan: transferir proyectos entre escenarios" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:221 msgid "Allocation: [{0},{1}]" msgstr "Asignación: [{0},{1}]" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:193 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:194 msgid "Changes saved" msgstr "Cambios guardados" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1263 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1282 msgid "See scheduling" msgstr "Ver planificación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:106 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:337 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:107 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:338 msgid "Progress measurements" msgstr "Medidas de progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1210 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1211 msgid "Add measure" msgstr "Añadir medida" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java:51 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:469 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:472 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java:52 #: navalplanner-webapp/src/main/webapp/planner/editTask.zul:68 msgid "Subcontract" msgstr "Subcontratar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:243 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:253 msgid "Work report saved" msgstr "Parte de trabajo guardado" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:120 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:56 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:40 -msgid "End" -msgstr "Fin" - -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:56 -msgid "Found resources" -msgstr "Recursos encontrados" - -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29 -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30 msgid "Relationship" msgstr "Relación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1365 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:52 +msgid "Found resources" +msgstr "Recursos encontrados" + +#: navalplanner-webapp/src/main/webapp/planner/main.zul:57 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:41 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:121 +msgid "End" +msgstr "Fin" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1366 msgid "The date is not valid, the date must be not empty" msgstr "La fecha no es válida, no debe ser vacía" -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:25 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:26 msgid "User login name" msgstr "Nombre de usuario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:272 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:317 msgid "Cost Categories" msgstr "Categorías de coste" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:267 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:312 msgid "criterion type not specified" msgstr "tipo de criterio no especificado" -#: navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:22 -msgid "NavalPlan: Companies" -msgstr "NavalPlan: Empresas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:142 -msgid "must be not empty" -msgstr "no puede ser vacío" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:74 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64 msgid "April" msgstr "Abril" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:69 -msgid "Show all resource assignments" -msgstr "Mostrar todas las asignaciones de recursos" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:143 +msgid "must be not empty" +msgstr "no puede ser vacío" -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:21 +#: navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:23 +msgid "NavalPlan: Companies" +msgstr "NavalPlan: Empresas" + +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:22 msgid "Users List" msgstr "Lista de usuarios" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:26 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:54 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:56 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:55 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:57 msgid "Task quality forms" msgstr "Formularios de calidad de tarea" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:526 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:601 msgid "Not working day" msgstr "Día no laborable" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:29 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:135 msgid "Cost category" msgstr "Categoría de coste" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:688 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:689 msgid "It can not be deleted. At least one sequence is necessary." msgstr "No se puede borrar. Al menos una secuencia es necesaria." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java:73 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java:74 msgid "Resource allocation" msgstr "Asignación de recursos" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:50 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:51 msgid "Amount work" msgstr "Cantidad de trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:170 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:171 msgid "please, select a quality form" msgstr "por favor, seleccione un formulario de calidad" @@ -3632,210 +3686,197 @@ msgstr "por favor, seleccione un formulario de calidad" msgid "Select entity:" msgstr "Seleccione entidad:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:399 +#: navalplanner-webapp/src/main/java/org/navalplanner/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." -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:63 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:64 msgid "Unindent selected task" msgstr "Desindentar tarea seleccionada" -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:43 -msgid "Customer reference code" -msgstr "Código de referencia del cliente" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:61 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:62 msgid "Constraint" msgstr "Restricción" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:149 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 +msgid "Customer reference code" +msgstr "Código de referencia del cliente" + +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150 msgid "Add New Label Type Field" msgstr "Añadir nuevo campo de tipo de etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:288 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:51 -msgid "Hours Worked Per Resource In A Month" -msgstr "Horas trabajadas por recurso en un mes" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:155 msgid "Create Exception Day Type" msgstr "Crear tipo de día de excepción" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:384 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:333 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:41 +msgid "Hours Worked Per Resource In A Month" +msgstr "Horas trabajadas por recurso en un mes" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:402 msgid "Time finish cannot be null" msgstr "La hora de fin no puede ser nula" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:115 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:116 msgid "Customer reference" msgstr "Referencia de cliente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:328 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:148 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:454 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:747 #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:145 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:660 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:739 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:864 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:897 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:906 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:929 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:516 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:526 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:758 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:461 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:153 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:329 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:517 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:527 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:662 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:741 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:866 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:916 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:925 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:948 msgid "Information" msgstr "Información" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:928 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:947 msgid "Sorry, you do not have permissions to access this project" msgstr "Lo sentimos, no tiene permisos para acceder a este proyecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:491 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:492 msgid "END" msgstr "FIN" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:221 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:223 msgid "Worker saved" msgstr "Trabajador guardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:260 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:261 msgid "can not pass until the previous item is passed." msgstr "no se puede pasar mientras el elemento no anterior sea pasado." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementModel.java:205 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementModel.java:206 msgid "New hours group " msgstr "Nuevo grupo de horas " -#: navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:21 +#: navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:22 msgid "NavalPlan: Quality Forms" msgstr "NavalPlan: Formularios de calidad" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:457 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:460 msgid "Assign element to queue manually" msgstr "Asignar elemento a cola manualmente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:215 -msgid "Resource: {0} " -msgstr "Recurso: {0} " - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:462 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:463 msgid "percentage cannot be duplicated" msgstr "el porcentaje no puede estar duplicado" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:54 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:216 +msgid "Resource: {0} " +msgstr "Recurso: {0} " + +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:55 msgid "Edit Template" msgstr "Editar Plantilla" -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:26 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:27 msgid "Heading" msgstr "Cabecera" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:112 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:114 msgid "finish not later than" msgstr "acabar no después de" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:279 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:324 msgid "Work Hours" msgstr "Horas de trabajo" -#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:163 +#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:164 msgid "Company ID already used. It has to be be unique" msgstr "NIF de la empresa ya está siendo usado. Debe ser único" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:121 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:122 msgid "There is no material category with this code" msgstr "No hay ninguna categoría de materiales con este código" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java:187 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java:188 msgid "Percentages should sum 100" msgstr "Los porcentajes debería sumar 100" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:283 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:284 msgid "Could not save machine" msgstr "No se pudo guardar la máquina" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:80 -msgid "Unable to convert value to {0} type" -msgstr "No se pudo convertir el valor a tipo {0}" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:334 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:339 msgid "The calendar exception type not found" msgstr "Tipo de excepción de calendario no encontrado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:199 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:81 +msgid "Unable to convert value to {0} type" +msgstr "No se pudo convertir el valor a tipo {0}" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:220 msgid "Worker must be not-null" msgstr "El trabajador no debe ser nulo" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1049 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1067 msgid "Some criterion satisfactions overlap in time" msgstr "Algunos criterios satisfechos se solapan en el tiempo" -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:48 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:49 msgid "Value last progress measurement" msgstr "Valor última medida de progreso" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:43 msgid "Worker assignments" msgstr "Asignaciones de trabajador" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:303 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:126 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:153 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:220 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:172 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:408 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:430 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:501 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:1034 -#, java-format +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:147 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:174 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:402 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:173 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:409 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:431 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:533 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:221 msgid "{0} already exists" msgstr "{0} ya existe" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:309 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:314 msgid "Create Worker" msgstr "Crear trabajador" -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:37 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:38 msgid "Code " msgstr "Código" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:41 -msgid "Paper size" -msgstr "Tamaño del papel" - #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:52 msgid "Password confirmation" msgstr "Confirmación de contraseña" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:75 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:88 msgid "Work Report" msgstr "Parte de trabajo" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:67 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:68 msgid "Indent selected task" msgstr "Indentar tarea seleccionada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:189 -msgid "" -"Cannot delete type of work hours. It is being used at this moment in some " -"cost category." -msgstr "" -"No se puede borrar el tipo de hora de trabajo. Está siendo usada en este " -"momento en alguna categoría de coste." - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:278 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:323 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:115 msgid "Unit Measures" msgstr "Unidades de medida" +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:39 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:63 msgid "Show progress" msgstr "Mostrar progreso" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:139 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:140 msgid "Work" msgstr "Trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:452 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:459 msgid "" "The task has got progress consolidations. It must delete all consolidations " "to change the resource allocation type " @@ -3843,22 +3884,17 @@ msgstr "" "La tarea tiene consolidaciones de progreso. Debe borrar todas las " "consolidaciones para cambiar el tipo de asignación de recurso " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:532 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:120 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:402 -#: navalplanner-webapp/src/main/webapp/common/event_error.zul:21 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:121 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:626 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403 msgid "Error" msgstr "Error" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:131 msgid "Cost Performance Index" msgstr "Eficiencia en coste" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:128 -msgid "ETC" -msgstr "ETC" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:181 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:182 msgid "" "Criterion is not valid, the criterion overlap other criterionSatisfaction " "whith same criterion" @@ -3866,11 +3902,15 @@ msgstr "" "Criterion no es válido, otro criterionSatisfaction se solapa con el mismo " "criterion" -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:96 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:129 +msgid "ETC" +msgstr "ETC" + +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:104 msgid "Log out" msgstr "Salir" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:23 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:24 msgid "Add new configuration unit" msgstr "Añadir nueva unidad de configuración" @@ -3878,12 +3918,7 @@ msgstr "Añadir nueva unidad de configuración" msgid "Main preferences" msgstr "Preferencias principales" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationCommand.java:66 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:81 -msgid "Progress consolidation" -msgstr "Consolidación de progreso" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:179 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:180 msgid "" "Criterion is not valid, it overlaps other criterionSatisfaction with the " "same criterion" @@ -3891,172 +3926,167 @@ msgstr "" "Criterion no válido, otro criterionSatisfaction se solapa con el mismo " "criterionType" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:163 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationCommand.java:67 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:82 +msgid "Progress consolidation" +msgstr "Consolidación de progreso" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:246 msgid "Label type saved" msgstr "Tipo de etiqueta guardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:418 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:567 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:419 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:568 msgid "missing field name in a description value" msgstr "falta nombre de campo en un valor de descripción" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:46 msgid "Add new worker assignment" msgstr "Añadir nueva asignación de trabajador" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:440 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:441 msgid "Show all elements" msgstr "Mostrar todos los elementos" -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:65 -msgid "Limited resource" -msgstr "Recurso limitante" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:148 +msgid "It couldn't complete all the reassignations" +msgstr "No se han podido completar todas las reasignaciones" #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:77 msgid "Show dependencies:" msgstr "Mostrar dependencias:" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:42 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:66 +msgid "Limited resource" +msgstr "Recurso limitante" + +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:27 msgid "Task Information" msgstr "Información de la tarea" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:137 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:139 msgid "Hours Group at " msgstr "Grupo de horas en " -#: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:26 +#: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:27 msgid "Your session has expired after inactivity period. Please log in again." msgstr "" "Su sesión ha expirado tras un tiempo de inactividad. Por favor, inicie " "sesión de nuevo." -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:61 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:59 -msgid "Total Estimated hours" -msgstr "Horas totales estimadas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:165 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:166 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:191 msgid "SPREAD" msgstr "PROPAGACIÓN" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:304 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:309 msgid "a day is empty" msgstr "un día está vacío" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:121 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:122 msgid "Budgeted Cost Work Scheduled" msgstr "Coste de trabajo presupuestado planificado" -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:56 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:57 msgid "Name cannot be null or empty" msgstr "El nombre no puede ser nulo o vacío" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:109 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:340 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:110 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:341 msgid "Progress measurements: " msgstr "Medidas de progreso: " -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:31 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:32 msgid "Queue Element Information" msgstr "Información de elemento de cola" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:111 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:136 msgid "Start Date" msgstr "Fecha de inicio" -#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:31 msgid "Create Order" msgstr "Crear proyecto" -#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:1 -msgid "NavalPlan: Resources List" -msgstr "NavalPlan: Lista de recursos" - -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:22 msgid "Virtual Workers Groups List" msgstr "Lista de grupos de trabajadores virtuales" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 msgid "Cost Variance" msgstr "Desviación en coste" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:469 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:470 msgid "criterion type does not allow resource hierarchy" msgstr "el tipo de criterio no permite jerarquía de recursos" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:136 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:139 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:149 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:89 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:150 msgid "Total" msgstr "Total" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:47 -msgid "A1" -msgstr "A1" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:221 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:98 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:222 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:99 msgid "Invalidate" msgstr "Invalidar" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:102 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:103 msgid "Budget hours" msgstr "Horas del presupuesto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:162 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:165 msgid "Edit task: {0}" msgstr "Editar tarea: {0}" -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:52 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:53 msgid "Select destination" msgstr "Seleccionar destino" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:528 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:268 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:529 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:269 msgid "must be greater than the previous date." msgstr "debe ser mayor que la fecha anterior" -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:21 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:22 msgid "NavalPlan: Advanced allocation" msgstr "NavalPlan: Asignación avanzada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1458 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java:551 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1481 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java:583 msgid "Show all" msgstr "Mostrar todo" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:44 -msgid "A4" -msgstr "A4" - -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:37 -msgid "Estimated hours" -msgstr "Horas estimadas" - -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:27 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:57 msgid "Default price" msgstr "Precio por defecto" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:163 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:38 +msgid "Estimated hours" +msgstr "Horas estimadas" + +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:116 msgid "Apply tab changes" msgstr "Aplicar cambios de la pestaña" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:236 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:246 msgid "passwords don't match" msgstr "las contraseñas no conciden" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:71 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:85 +msgid "Day properties" +msgstr "Propiedades del día" + +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:72 msgid "Hours groups" msgstr "Grupos de horas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:182 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:183 msgid "Transfer" msgstr "Transferir" -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:21 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:22 msgid "Work Hours Types List" msgstr "Lista de tipos de horas de trabajo" @@ -4064,30 +4094,30 @@ msgstr "Lista de tipos de horas de trabajo" msgid "new milestone" msgstr "nuevo hito" -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:46 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:47 msgid "Value last progress reported" msgstr "Valor último progreso notificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:254 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:299 msgid "Report Progress" msgstr "Notificar progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:146 +#: navalplanner-webapp/src/main/java/org/navalplanner/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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:116 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:126 msgid "Create User" msgstr "Crear usuario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:307 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:309 msgid "Schedule from start to deadline" msgstr "Planificar desde el principio a la fecha límite" -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:49 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:51 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:53 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:50 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:52 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:54 msgid "Estimated days" msgstr "Días estimados" @@ -4095,15 +4125,15 @@ msgstr "Días estimados" msgid "Reference date" msgstr "Fecha de referencia" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:45 msgid "Selected node:" msgstr "Nodo seleccionado:" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:73 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:74 msgid "Progress Evolution" msgstr "Evolución del progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:251 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:252 msgid "Create new project from template" msgstr "Crear nuevo proyecto a partir de plantilla" @@ -4111,48 +4141,44 @@ msgstr "Crear nuevo proyecto a partir de plantilla" msgid "NavalPlan: Task Scheduling Status In Project" msgstr "NavalPlan: Estado de planificación en proyecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:111 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:112 msgid "Complete, Partially or Not Scheduled. (Drag and drop to move tasks)" msgstr "" "Completa, parcialmente o no planificada. (Pinche y arrastre para mover " "tareas)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 -msgid "CV" -msgstr "CV" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:135 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:88 msgid "Original" msgstr "Original" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:30 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 +msgid "CV" +msgstr "CV" + +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:31 msgid "Stretches function configuration" msgstr "Configuración de la función de tramos" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:57 -msgid "Week" -msgstr "Semana" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:292 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:306 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:295 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:309 msgid "Not indentable" msgstr "No indentable" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:490 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:69 +msgid "Resource allocation type" +msgstr "Tipo de asignación de recursos" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:491 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:70 msgid "List of materials for all categories (select one to filter)" msgstr "" "Lista de materiales para todas las categorías (seleccione una para filtrar)" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:68 -msgid "Resource allocation type" -msgstr "Tipo de asignación de recursos" - -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:98 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:99 msgid "User disabled" msgstr "Usuario deshabilitado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:573 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:728 msgid "In the available periods {0} only {1} hours are available." msgstr "En los períodos disponibles {0} solo {1} horas están disponibles." @@ -4160,32 +4186,33 @@ msgstr "En los períodos disponibles {0} solo {1} horas están disponibles." msgid "Association with profiles" msgstr "Asociación con perfiles" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:626 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:627 msgid "Task {0} : Duplicate code in DB" msgstr "Tarea {0} : Código duplicado en BD" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:120 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:25 +#: navalplanner-webapp/src/main/webapp/common/error.zul:30 +msgid "Message - {0}" +msgstr "Mensaje - {0}" + +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:121 msgid "worker's surname not specified" msgstr "apellidos del trabajador no especificados" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:210 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:211 msgid "Error on removing workReportType: " msgstr "Error al borrar tipo de parte de trabajo: " -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:47 -#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:41 msgid "Save changes" msgstr "Guardar cambios" -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:44 -msgid "Select source" -msgstr "Seleccionar origen" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:191 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:192 msgid "Total dedication" msgstr "Dedicación total" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:668 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:669 msgid "" "You can not remove the task \"{0}\" because of this or any of its children " "are already in use in some work reports" @@ -4193,15 +4220,19 @@ msgstr "" "No puede borrar la tarea \"{0}\" porque alguno de sus hijos ya se está " "usando en algún parte de trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:807 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:45 +msgid "Select source" +msgstr "Seleccionar origen" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:825 msgid "Worker deleted" msgstr "Trabajador borrado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:726 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:727 msgid "Select entity, please" msgstr "Seleccionar entidad, por favor" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:222 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:293 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: " @@ -4210,30 +4241,31 @@ msgstr "" msgid "Number of digits:" msgstr "Número de dígitos:" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:37 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:43 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:38 msgid "Subcontratation date" msgstr "Fecha de subcontratación" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:58 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:141 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:93 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:182 msgid "Day" msgstr "Día" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:150 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:233 msgid "Edit Label Type" msgstr "Editar tipo de etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:912 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1172 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:349 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:911 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1197 msgid "Please, select an item" msgstr "Por favor, seleccione un elemento" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:179 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:180 msgid "Work report type saved" msgstr "Tipo de partes de trabajo guardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1123 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1122 msgid "Cannot be higher than finish hour" msgstr "No puede ser mayor que la fecha de fin" @@ -4241,12 +4273,12 @@ msgstr "No puede ser mayor que la fecha de fin" msgid "Prefix" msgstr "Prefijo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:63 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:64 msgid "New Template element" msgstr "Nuevo elemento de plantilla" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:55 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:56 msgid "Subcontracted code" msgstr "Código subcontratado" @@ -4254,95 +4286,95 @@ msgstr "Código subcontratado" msgid "NavalPlan: Hours Worked Per Worker In A Month" msgstr "NavalPlan: Horas trabajadas por trabajador en un mes" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:249 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:320 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:251 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:325 msgid "The base calendar parent not found" msgstr "Calendario base padre no encontrado" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:138 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:141 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:94 msgid "Non Consolidated" msgstr "No consolidado" -#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:33 +#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:34 msgid "Reassigning type" msgstr "Tipo de reasignación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:291 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:295 msgid "Edit Virtual Workers Group" msgstr "Editar grupo de trabajadores virtuales" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:438 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:441 msgid "Edit limiting resource element" msgstr "Editar elemento de recurso limitante" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:380 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:133 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:156 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:82 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:381 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:157 msgid "Position" msgstr "Posición" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:861 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:862 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" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:96 -msgid "Edit work report" -msgstr "Editar parte de trabajo" - -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:103 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:104 msgid "Incorrect authentication" msgstr "Identificación incorrecta" +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:112 +msgid "Edit work report" +msgstr "Editar parte de trabajo" + +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:42 #: navalplanner-webapp/src/main/webapp/planner/editTask.zul:53 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:41 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:35 msgid "Edit task" msgstr "Editar tarea" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:44 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:45 msgid "Limiting resources (project)" msgstr "Recursos limitantes (proyecto)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1173 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1174 msgid "" "Progress measurements that are reported by quality forms can not be removed" msgstr "" "Las medidas de progreso notificadas por formularios de calidad no pueden ser " "modificadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:763 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:764 msgid "A description field of the same name already exists." msgstr "Ya existe un campo de descripción con el mismo nombre." -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:44 msgid "Current value" msgstr "Valor actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:164 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:165 msgid "Edit Quality Form" msgstr "Editar formulario de calidad" -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:79 -msgid "Save and Continue" -msgstr "Guardar y continuar" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:822 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:823 msgid "Duplicate progress assignment for task " msgstr "Asignación de progreso duplicada para la tarea " -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:51 -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:45 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:48 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:54 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:83 +msgid "Save and Continue" +msgstr "Guardar y continuar" + +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:46 msgid "Zoom level" msgstr "Nivel de zoom" -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:27 -#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:159 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:28 msgid "Quality form" msgstr "Formulario de calidad" -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:97 msgid "Go!" msgstr "Ir!" @@ -4350,84 +4382,88 @@ msgstr "Ir!" msgid "Profile data" msgstr "Datos del perfil" -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:271 +msgid "The name of the label is empty." +msgstr "El nombre de la etiqueta está vacío." + +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:31 msgid "Configuration" msgstr "Configuración" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeModel.java:98 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeModel.java:99 msgid "It was not possible load entity. Not found. Id: " msgstr "No ha sido posible cargar la entidad. No encontrada. Id: " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:559 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:569 msgid "Create Virtual Workers Group" msgstr "Crear grupo de trabajadores virtuales" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:845 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:864 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:885 msgid "Hours invested" msgstr "Horas invertidas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:158 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:741 +msgid "Project saved" +msgstr "Proyecto guardado" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:160 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. " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:739 -msgid "Project saved" -msgstr "Proyecto guardado" - -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:44 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:45 msgid "task :" msgstr "tarea :" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:702 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:712 msgid "ALL" msgstr "TODOS" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:214 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:215 msgid "criterion satisfaction's resource not specified" msgstr "recurso del criterio satisfecho no especificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:522 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:597 msgid "Derived exception" msgstr "Excepción derivada" -#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:21 -msgid "Unit Measures List" -msgstr "Lista de unidades de medida" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:246 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:291 msgid "Machines" msgstr "Máquinas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:179 -msgid "Confirm deleting this profile. Are you sure?" -msgstr "Confirmar el borrado de este perfil. ¿Está seguro?" +#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:22 +msgid "Unit Measures List" +msgstr "Lista de unidades de medida" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:152 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:153 msgid "Couldn't find element: {0}" msgstr "No se pudo encontrar el elemento: {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:147 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:222 +msgid "Confirm deleting this profile. Are you sure?" +msgstr "Confirmar el borrado de este perfil. ¿Está seguro?" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:148 msgid "You should select a destination scenario" msgstr "Debe seleccionar un escenario de destino" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:184 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:268 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:185 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:269 msgid "unit type code not found" msgstr "código de tipo de unidad no encontrado" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:41 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:42 msgid "Resource :" msgstr "Recurso :" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:160 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:180 msgid "Calendar Exception Type saved" msgstr "Tipo de excepción de calendario guardado" -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:39 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:40 msgid "Destination scenario" msgstr "Escenario de destino" @@ -4439,38 +4475,38 @@ msgstr "Vista de la compañía" msgid "NavalPlan: Configuration" msgstr "NavalPlan: Configuración" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:750 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:751 msgid "Not editable for containing more that an hours group." msgstr "No editable por contener más de un grupo de horas." -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:24 -msgid "Filter by" -msgstr "Filtrar por" - -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:75 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:76 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:45 msgid "Limiting resource" msgstr "Recurso limitante" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java:57 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:146 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:25 +msgid "Filter by" +msgstr "Filtrar por" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java:58 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:147 msgid "Calendar allocation" msgstr "Asignación de calendario" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:818 +#: navalplanner-webapp/src/main/java/org/navalplanner/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" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:111 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:33 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:85 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:32 msgid "Category" msgstr "Categoría" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:153 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:154 msgid "must be greater than finish date" msgstr "debe ser mayor que la fecha de fin" @@ -4478,81 +4514,80 @@ msgstr "debe ser mayor que la fecha de fin" msgid "NavalPlan: Materials Needs At Date" msgstr "NavalPlan: Necesidad de materiales en fecha" -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:86 -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:157 -msgid "[generic all workers]" -msgstr "[genérico todos los trabajadores]" - #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:26 msgid "Category data" msgstr "Datos de categoría" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:94 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:79 +msgid "[generic all workers]" +msgstr "[genérico todos los trabajadores]" + +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:103 msgid "Search" msgstr "Buscar" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:125 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:126 msgid "Add New Complementary Field" msgstr "Añadir nuevo campo complementario" -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:38 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:229 +msgid "Work weeks list" +msgstr "Lista de las semanas de trabajo" + +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:39 msgid "Source scenario" msgstr "Escenario de origen" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:117 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:118 msgid "%" msgstr "%" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:49 -#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:50 +#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:43 msgid "Remove calendar" msgstr "Borrar calendario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:311 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:255 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:638 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:506 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:138 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1328 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:139 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:648 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:512 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:256 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:312 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java:228 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:655 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1525 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1689 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1347 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:656 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1548 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1712 msgid "must be lower than finish date" msgstr "debe ser menor que la fecha de fin" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:28 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:758 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:160 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:78 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:69 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:119 -msgid "Resource" -msgstr "Recurso" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:70 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:71 msgid "Total task hours" msgstr "Total de horas de tarea" -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:45 -msgid "Date last progress reported" -msgstr "Fecha último progreso notificado" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:757 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:29 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:70 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:135 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:79 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:161 +msgid "Resource" +msgstr "Recurso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/RedirectorSynthetiser.java:122 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/RedirectorSynthetiser.java:123 msgid "Could not load any resource" msgstr "No se pudo cargar un recurso" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:34 -msgid "Material search" -msgstr "Búsqueda de materiales" +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:46 +msgid "Date last progress reported" +msgstr "Fecha último progreso notificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:289 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:334 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 msgid "Work And Progress Per Project" msgstr "Trabajo y progreso por proyecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:362 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:383 msgid "" "You must allow multiple active criteria for this type to use this assignment " "strategy" @@ -4560,100 +4595,108 @@ msgstr "" "Debe permitir múltiples criterios activos para este tipo para usar esta " "estrategia de asignación" -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:31 msgid "sub elements" msgstr "sub elementos" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:157 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:158 msgid "Default Label" msgstr "Etiqueta por defecto" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:101 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:155 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:187 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:108 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:85 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:188 msgid "Close" msgstr "Cerrar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:465 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:470 msgid "Specific Allocations" msgstr "Asignaciones específicas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateController.java:117 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:270 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:271 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateController.java:126 msgid "error doing reassignation: {0}" msgstr "Error realizando la reasignación: {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:348 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:349 msgid "Time filter" msgstr "Filtro de tiempo" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:59 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:60 msgid "Move selected task up" msgstr "Mover tarea seleccionada hacia arriba" -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:27 msgid "Select criteria set or specific resources for allocation" msgstr "" "Seleccione conjunto de criterios o recursos específicos para la asignación" +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:34 +msgid "Work Report Lines List" +msgstr "Lista de líneas de parte de trabajo" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:316 +msgid "Create copy" +msgstr "Crear copia" + #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:27 msgid "Company data" msgstr "Datos de la empresa" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:33 -msgid "Work Report Lines List" -msgstr "Lista de líneas de parte de trabajo" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:290 -msgid "Create copy" -msgstr "Crear copia" - -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:21 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:22 msgid "Criterions Requirement" msgstr "Criterios requeridos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:207 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:215 msgid "Unit type code cannot be empty" msgstr "El código del tipo de unidad no puede ser vacío" -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:46 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:47 msgid "Average of the estimated hours" msgstr "Media de horas estimadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:159 -msgid "Create Unit Type" -msgstr "Crear tipo de unidad" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:177 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:239 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:178 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:240 msgid "Quality form saved" msgstr "Formulario de calidad guardado" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:142 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:167 +msgid "Create Unit Type" +msgstr "Crear tipo de unidad" + +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:143 msgid "Label Type fields" msgstr "Campos de tipo de etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:266 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:311 msgid "Users" msgstr "Usuarios" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:102 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:103 msgid "Hours Management" msgstr "Administración de horas" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32 msgid "New task:" msgstr "Nueva tarea :" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:88 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:140 +msgid "" +"Please use some of the compatible browsers: Chrome, Firefox, Safari or " +"Epiphany." +msgstr "" +"Por favor usa uno de los navegadores compatibles: Chrome, Firefox, Safari o " +"Epiphany." + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:94 msgid "specific allocation" msgstr "asignación específica" -#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:146 +#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:147 msgid "company name has to be unique. It is already used" msgstr "el nombre de la empresa debe ser único. Ya está siendo usado" -#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:32 +#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:33 msgid "" "Another user has modified the same data, so the operation cannot be safely " "completed." @@ -4661,279 +4704,272 @@ msgstr "" "Otro usuario ha modificado los mismos datos, por tanto la operación no se " "puede completar de manera segura." -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:73 -msgid "Type of day" -msgstr "Tipo de día" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:217 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:231 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:218 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:232 msgid "Template saved" msgstr "Plantilla guardada" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:576 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:577 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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:162 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:172 msgid "User saved" msgstr "Usuario guardado" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:46 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47 msgid "Task quality form name" msgstr "Nombre del formulario de calidad de tarea" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1079 -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:155 -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:160 -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:180 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1097 msgid "Some cost category assignments overlap in time" msgstr "Algunas asignaciones a categorías de coste se solapan en el tiempo" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:25 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:26 msgid "Imputed hours calculation" msgstr "Cálculo de horas imputadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:117 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:119 msgid "FINISH_NOT_LATER_THAN" msgstr "ACABAR_NO_DESPUES_DE" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:273 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:274 msgid ": code not found" msgstr ": código no encontrado" -#: navalplanner-webapp/src/main/webapp/common/error.zul:36 -#: navalplanner-webapp/src/main/webapp/common/event_error.zul:30 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:51 +#: navalplanner-webapp/src/main/webapp/common/error.zul:55 msgid "Exit session" msgstr "Salir de la sesión" -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:30 -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:52 -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:66 -#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineGroupTemplate.java:274 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:53 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:67 msgid "Group" msgstr "Grupo" -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:59 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:27 -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:56 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:62 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:59 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28 msgid "Enabled" msgstr "Activado" -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:29 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:30 msgid "Statistics list " msgstr "Lista de estadísticas " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:122 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:143 msgid "Edit Exception Day Type" msgstr "Editar tipo de día de excepción" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:221 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:222 msgid "All resources must be limiting. " msgstr "Todos los recursos deben ser limitantes. " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:326 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:327 msgid "Filter by worker" msgstr "Filtrar por trabajadores" -#: navalplanner-webapp/src/main/webapp/resources/machine/machines.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/machine/machines.zul:22 msgid "NavalPlan: Machines" msgstr "NavalPlan: Máquinas" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:46 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:47 msgid "Load due to current project" msgstr "Carga debido al proyecto actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1274 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1286 msgid "You are going to change the assignment function. Are you sure?" msgstr "Va a cambiar la función de asignación. ¿Está seguro?" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:150 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:200 msgid "There must be at least 2 stretches for doing interpolation" msgstr "Debe haber al menos dos tramos para hacer interpolación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:276 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:321 msgid "Exception Days" msgstr "Días de excepción" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:67 -msgid "Show all labels" -msgstr "Mostrar todas las etiquetas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:295 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:296 msgid "Incompatible update: stored resource is not of type: {0}" msgstr "Actualización incompatible: el recurso almacenado no es de tipo: {0}" -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:137 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:82 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:107 -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:38 -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:41 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:131 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:113 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:97 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:90 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:109 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:75 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:212 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:37 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:41 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:171 -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:39 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:132 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:90 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:114 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:98 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:40 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:133 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:132 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:187 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:38 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:42 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:213 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:42 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:137 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:82 msgid "Save & Continue" msgstr "Guardar y continuar" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:89 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:90 msgid "Scheduling mode" msgstr "Modo de planificación" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:22 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:22 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:52 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:54 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:50 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:23 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:55 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:53 msgid "Filter" msgstr "Filtrar" -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:26 msgid "Assigned locations" msgstr "Ubicaciones asignadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:239 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:247 msgid "Unit type saved" msgstr "Tipo de unidad guardado" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:266 -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:128 -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:137 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:267 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" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:48 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:63 -msgid "Report progress" -msgstr "Notificar progreso" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:201 msgid "Create Machine" msgstr "Crear máquina" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:122 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:64 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49 +msgid "Report progress" +msgstr "Notificar progreso" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:123 msgid "ACWP" msgstr "ACWP" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:576 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:731 msgid "The periods available depend on the resource's calendar." msgstr "Los períodos de disponibilidad dependen del calendario del recurso." -#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:54 +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:55 msgid "START" msgstr "INICIO" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:65 -msgid "generic machines allocation" -msgstr "asignación genérica de máquinas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:310 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:312 msgid "Schedule from the deadline to start" msgstr "Planificar desde la fecha límite al principio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:467 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:71 +msgid "generic machines allocation" +msgstr "asignación genérica de máquinas" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:470 msgid "Non limiting resource assignation" msgstr "Asignación de recursos no limitantes" -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:81 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:74 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:86 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:887 +msgid "" +"Deleting this subcontracted project, you are going to lose the relation to " +"report progress. Are you sure?" +msgstr "" +"Borrando este proyecto subcontratado, perderá la relación para notificar " +"progresos. ¿Está seguro?" + +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:82 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:87 msgid "Back" msgstr "Atrás" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:56 msgid "Subcontractor" msgstr "Subcontratista" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:40 -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:32 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:41 msgid "Administration" msgstr "Administración" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:292 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:238 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:621 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:489 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1311 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:631 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:495 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:239 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:293 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java:211 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:637 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1508 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1671 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1330 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:638 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1531 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1694 msgid "must be greater than start date" msgstr "debe ser mayor que la fecha de inicio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:92 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:93 msgid "Create Company" msgstr "Crear empresa" -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:46 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:47 msgid "Cancel and return" msgstr "Cancelar y volver" -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:33 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:30 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:31 msgid "Assign quality form" msgstr "Asignar formulario de calidad" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:386 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:202 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:222 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:387 msgid "Delete item {0}. Are you sure?" msgstr "Borrar elemento {0}. ¿Está seguro?" -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:49 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:50 msgid "Unit measure name" msgstr "Nombre de la unidad de medida" -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:38 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:39 msgid "worked hours" msgstr "horas trabajadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:771 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:143 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:773 +#: navalplanner-webapp/src/main/java/org/navalplanner/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" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:488 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:489 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" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:70 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:106 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:59 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:52 msgid "Allocations" msgstr "Asignaciones" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:52 msgid "Task code" msgstr "Código de la tarea" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:49 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132 -msgid "Length" -msgstr "Longitud" - -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:84 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:85 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 msgid "Capacity" msgstr "Capacidad" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:177 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:273 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:50 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:133 +msgid "Length" +msgstr "Longitud" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:299 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:178 msgid "Create derived" msgstr "Crear derivado" @@ -4941,63 +4977,63 @@ msgstr "Crear derivado" msgid "it must be greater than zero" msgstr "debe ser mayor que cero" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:129 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:130 msgid "must be a real positive number" msgstr "debe ser un número real positivo" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:110 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:121 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:111 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:122 msgid "Total hours task" msgstr "Total de horas de tarea" -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:32 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:33 msgid "No Allocations have been done" msgstr "No se han hecho asignaciones" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:392 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:409 msgid "Removed calendar \"{0}\"" msgstr "Borrado calendario \"{0}\"" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1065 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1084 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:23 msgid "Create project" msgstr "Crear proyecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:106 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:108 msgid "START_IN_FIXED_DATE" msgstr "COMENZAR_EN_FECHA_FIJA" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:49 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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1299 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1300 msgid "" "The date is not valid, the date must be unique for this progress assignment" msgstr "La fecha no es válida, debe ser única para esta asignación de progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:112 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:113 msgid "Edit Criterion Type" msgstr "Editar tipo de criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:79 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:81 msgid "as soon as possible" msgstr "tan pronto como sea posible" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:426 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:445 msgid "The code cannot be empty." msgstr "El código no puede estar vacío" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 msgid "Human hours per machine working hour within configuration unit" msgstr "" "Horas humanas por hora de trabajo de máquina dentro de unidad de " "configuración" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:112 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:113 msgid "" "Could not add those authorizations to user {0} because they were already " "present." @@ -5005,34 +5041,30 @@ msgstr "" "No se pudieron añadir esas autorizaciones al usuario {0} porque ya estaban " "presentes." -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:102 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:46 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:47 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:103 msgid "New work report" msgstr "Nuevo parte de trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:844 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:662 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:862 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:668 msgid "yes" msgstr "sí" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:45 -msgid "A3" -msgstr "A3" - -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:112 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:113 msgid "Select gap" msgstr "Seleccionar intervalo" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:62 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:63 msgid "Date Finish" msgstr "Fecha de fin" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:223 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:94 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:224 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:95 msgid "Validate" msgstr "Validar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:142 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:143 msgid "This resource has already been added." msgstr "Este recurso ya ha sido añadido." @@ -5040,13 +5072,13 @@ msgstr "Este recurso ya ha sido añadido." msgid "Calendar exception types" msgstr "Tipos de excepciones de calendario" -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:23 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:34 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:24 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:33 msgid "Cost category assignment" msgstr "Asignación de categoría de coste" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:149 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:150 msgid "missing code in a hour cost" msgstr "falta código en un coste por hora" @@ -5054,64 +5086,65 @@ msgstr "falta código en un coste por hora" msgid "All workers" msgstr "Todos los trabajadores" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:221 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:304 msgid "Label saved" msgstr "Etiqueta guardada" -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector_combo.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector_combo.zul:25 msgid "Select criteria or resources" msgstr "Seleccione criterios o recursos" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:25 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:23 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:26 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:24 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:24 msgid "Select required criteria set and press filter button" msgstr "" "Seleccione conjunto de criterios requeridos y pulse el botón de filtrar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:238 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:311 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:731 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:114 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:229 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:231 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:233 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:280 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:380 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:135 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:311 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1019 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1280 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:115 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java:147 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:310 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:228 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:230 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:232 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:945 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1204 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:44 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:42 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:43 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:49 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:82 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:86 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:38 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:48 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:127 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:46 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:43 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:72 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:95 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:732 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:42 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:48 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:44 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:50 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:84 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:88 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:43 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:53 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:43 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:54 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:72 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:128 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:47 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:93 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:43 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:63 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:33 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:37 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:44 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:40 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:134 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:32 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:93 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:41 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:42 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:48 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:39 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:52 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:39 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:135 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:44 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:42 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:42 msgid "cannot be null or empty" msgstr "no puede ser nulo o vacío" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:631 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:632 msgid "Hours Group {0} : Duplicate code in DB" msgstr "Grupo de horas {0} : Código duplicado en BD" @@ -5119,24 +5152,24 @@ msgstr "Grupo de horas {0} : Código duplicado en BD" msgid "NavalPlan: Work And Progress Per Project" msgstr "NavalPlan: Trabajo y Progreso por Proyecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:51 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:60 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:43 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:52 msgid "New code" msgstr "Código nuevo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java:90 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java:91 msgid "The progress type cannot be modified" msgstr "El tipo de progreso no puede ser modificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:441 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:412 msgid "Calculate Resources per Day" msgstr "Calcular recursos por día" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:995 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:996 msgid "The index fields and labels must be uniques and consecutives" msgstr "Los campos de índice y las etiquetas deben ser únicas y consecutivas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:249 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:250 msgid "" "Are you sure of changing the resource type? You will lose the criterions " "with different resource type." @@ -5144,7 +5177,7 @@ msgstr "" "¿Está seguro de cambiar el tipo de recurso? Los criterios con diferente tipo " "de recurso se perderán." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:129 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130 msgid "Estimate To Complete" msgstr "Estimación del coste pendiente" @@ -5152,91 +5185,103 @@ msgstr "Estimación del coste pendiente" msgid "NavalPlan: Estimated/Planned Hours Per Task" msgstr "NavalPlan: Horas por tarea estimadas/planificadas" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:29 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:109 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:30 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:84 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:29 msgid "Unit type" msgstr "Tipo de unidad" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:41 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:42 msgid "Load due to other assignments" msgstr "Carga debido a otras asignaciones" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:61 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:62 msgid "Sum of all task leafs imputed hours" msgstr "Suma de horas imputadas por todas las tareas hoja" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:638 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:644 msgid "This machine was already removed by other user" msgstr "Esta máquina ya ha sido borrada por otro usuario" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:25 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:26 msgid "Calendar data" msgstr "Datos del calendario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:248 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:293 msgid "Work Reports" msgstr "Partes de trabajo" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:168 +#: navalplanner-business/src/main/java/org/navalplanner/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" -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:21 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:22 msgid "Cost Categories List" msgstr "Lista de Categorías de Coste" -#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:108 +#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:109 msgid "code is already used" msgstr "el código ya está siendo usado" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:151 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:152 msgid "Criterion Requirements" msgstr "Criterios requeridos" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:128 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:143 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:176 -msgid "Workable Time" -msgstr "Tiempo trabajable" +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:148 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:185 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:212 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:65 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34 +msgid "Extra Effort" +msgstr "Esfuerzo extra" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:55 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:260 +msgid "Already exists other label with the same name" +msgstr "Ya existe otra etiqueta con el mismo nombre" + +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:56 msgid "Move selected task down" msgstr "Mover tarea seleccoinada hacia abajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:134 +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" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:32 msgid "Customer Reference" msgstr "Referencia de cliente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:776 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:133 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:146 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:778 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:147 msgid "spread values are not valid, at least one value should be true" msgstr "" "los valores de propagación no son válidos, al menos uno debe ser verdadero" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:88 -msgid "Create and assign label" -msgstr "Crear y asignar etiqueta" - -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:41 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:42 msgid "Optimistic" msgstr "Optimista" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:89 +msgid "Create and assign label" +msgstr "Crear y asignar etiqueta" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 msgid "SV" msgstr "SV" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1460 -msgid "Filter work reports" -msgstr "Filtrar partes de trabajo" - #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:83 msgid "Our company login" msgstr "Nombre de usuario de nuestra empresa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:369 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1483 +msgid "Filter work reports" +msgstr "Filtrar partes de trabajo" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:395 msgid "" "Default calendar cannot be removed. Please, change the default calendar in " "the Configuration window before." @@ -5245,17 +5290,17 @@ msgstr "" "por defecto en la ventana de configuración." #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:842 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:274 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:863 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:586 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:62 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:48 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:45 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:48 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:587 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:884 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:319 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:63 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:46 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:49 msgid "Progress" msgstr "Progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:127 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:128 msgid "" "This criterion type cannot be deleted because it has assignments to projects " "or resources" @@ -5263,7 +5308,7 @@ msgstr "" "Este tipo de criterio no se puede borrar porque tiene asignaciones a " "proyectos o recursos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1220 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1221 msgid "All progress types have already been assigned." msgstr "Todos los tipos de progreso ya han sido asignados." @@ -5271,23 +5316,23 @@ msgstr "Todos los tipos de progreso ya han sido asignados." msgid "Price per hour" msgstr "Precio por hora" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:208 -msgid "Project: {0} " -msgstr "Proyecto: {0} " - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:269 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:314 msgid "Calendars" msgstr "Calendarios" -#: navalplanner-webapp/src/main/webapp/common/page_not_found.zul:20 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:209 +msgid "Project: {0} " +msgstr "Proyecto: {0} " + +#: navalplanner-webapp/src/main/webapp/common/page_not_found.zul:21 msgid "NavalPlan: Page not found" msgstr "NavalPlan: Página no encontrada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:337 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:355 msgid "The date cannot be null" msgstr "La fecha no puede ser nula" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:315 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:316 msgid "" "Another task in the same branch is already reporting progress for this " "quality form" @@ -5295,41 +5340,45 @@ msgstr "" "Otra tarea en la misma rama ya está informando de un progreso para este " "formulario de calidad" -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:32 msgid "Show only current satisfied criteria" msgstr "Mostrar solo los criterios satisfechos actualmente" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:91 -msgid "Latest date" -msgstr "Fecha más tardía" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:372 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:392 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:211 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:231 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:373 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:393 msgid "Error on showing delete confirm" msgstr "Error al mostrar la confirmación de borrado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:688 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92 +msgid "Latest date" +msgstr "Fecha más tardía" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:671 msgid "Sum of all rows" msgstr "Suma de todas las filas" -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:87 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:88 msgid "Group by weeks" msgstr "Agrupar por semanas" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:72 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:82 msgid "Finish hour" msgstr "Hora de fin" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:175 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:199 msgid "Done {0} of {1}" msgstr "Hecho {0} de {1}" -#: navalplanner-webapp/src/main/webapp/users/users.zul:22 +#: navalplanner-webapp/src/main/webapp/users/users.zul:23 msgid "NavalPlan: Accounts" msgstr "NavalPlan: Cuentas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:140 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:23 +msgid "NavalPlan: Scenarios Management" +msgstr "NavalPlan: Gestión de Escenarios" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:194 msgid "" "Last stretch should have one hundred percent for length and amount of work " "percentage" @@ -5337,42 +5386,38 @@ msgstr "" "El último tramo debe tener 100% de porcentajes de longitud y cantidad de " "trabajo" -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:22 -msgid "NavalPlan: Scenarios Management" -msgstr "NavalPlan: Gestión de Escenarios" - -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:100 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:79 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 msgid "Filter by projects" msgstr "Filtrar por proyectos" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:22 -msgid "Criteria of selected type " -msgstr "Criterios del tipo seleccionado " - -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32 msgid "Each worker configuration unit name" msgstr "Nombre de la unidad de configuración de cada trabajador" -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:41 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:23 +msgid "Criteria of selected type " +msgstr "Criterios del tipo seleccionado " + +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:42 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:224 msgid "Active" msgstr "Activo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1257 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1258 msgid "This progress measurement can not be in " msgstr "Esta medida de progreso no puede estar en " -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:29 msgid "Inherited labels" msgstr "Etiquetas heredadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1242 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1243 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." @@ -5381,21 +5426,21 @@ msgstr "" "consolidado. Se requiere borrar la consolidación de todas sus medidas de " "progreso." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:909 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:289 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:292 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:910 msgid "Unindent" msgstr "Desindentar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:931 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1389 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:932 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1390 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" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:49 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:50 msgid "Direct labels" msgstr "Etiquetas directas" -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:91 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:92 msgid "Log in" msgstr "Entrar" @@ -5403,96 +5448,96 @@ msgstr "Entrar" msgid "Project name" msgstr "Nombre del proyecto" -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:52 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:53 msgid "Precision" msgstr "Precisión" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:371 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:372 msgid "missing code in a work report line" msgstr "falta código en una línea de parte de trabajo" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:77 -msgid "Show all reported hours" -msgstr "Mostrar todas las horas notificadas" - -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:21 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:22 msgid "NavalPlan: Subcontracted Tasks" msgstr "NavalPlan: Tareas subcontratadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:984 +msgid "Efforts" +msgstr "Esfuerzos" + +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:41 +msgid "Show all reported hours" +msgstr "Mostrar todas las horas notificadas" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:102 msgid "Projects List" msgstr "Lista de proyectos" -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:51 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:50 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:48 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:74 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:52 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:45 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:79 -#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:45 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:136 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:57 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:74 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:49 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:60 -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:43 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:42 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:54 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:44 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:65 +#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:45 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:80 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:58 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:137 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43 msgid "Generate code" msgstr "Generar código" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:109 -msgid "Scheduling state" -msgstr "Estado de planificación" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:368 -msgid "This template can not be removed because it has applications." -msgstr "Esta plantilla no se puede borrar porque tiene aplicaciones." - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:482 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:483 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." -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:27 -msgid "Select print page properties" -msgstr "Seleccione las propiedades de la página de impresión" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:110 +msgid "Scheduling state" +msgstr "Estado de planificación" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:369 +msgid "This template can not be removed because it has applications." +msgstr "Esta plantilla no se puede borrar porque tiene aplicaciones." #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21 msgid "NavalPlan: Project Costs Per Resource" msgstr "NavalPlan: costes de proyecto por recurso" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:205 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:206 msgid "criterion satisfaction's criterion not specified" msgstr "criterio del criterio satisfecho no especificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java:162 +#: navalplanner-webapp/src/main/java/org/navalplanner/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 " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:126 msgid "Scenarios must be enabled as more elements than master exist" msgstr "" "Los escenarios deben estar habilitados ya que existen más elementos que " "master" -#: navalplanner-webapp/src/main/webapp/common/error.zul:35 -#: navalplanner-webapp/src/main/webapp/common/event_error.zul:29 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:50 +#: navalplanner-webapp/src/main/webapp/common/error.zul:54 msgid "Reload" msgstr "Recargar" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:557 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:613 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:558 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:614 msgid "Task {0} : Task group is incompatible type with {1}" msgstr "Tarea {0} : El grupo de tareas tiene un tipo incompatible con {1}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:247 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:292 msgid "Virtual Workers Groups" msgstr "Grupos de trabajadores virtuales" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:25 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:26 msgid "Profiles authorization" msgstr "Autorización de perfiles" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:87 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:71 msgid "Assignation" msgstr "Asignación" @@ -5500,116 +5545,123 @@ msgstr "Asignación" msgid "Planning charts expanded" msgstr "Gráficos de planificación expandidos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:430 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:431 msgid "Not deletable" msgstr "Imborrable" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:165 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:189 msgid "Doing {0} reassignations" msgstr "Realizando {0} reasignaciones" -#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:47 +#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:48 msgid "code not specified" msgstr "código no especificado" -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:21 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:22 msgid "Projects list" msgstr "Lista de proyectos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:189 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:190 msgid "" "Cannot delete work report type. There are some work reports bound to it." msgstr "" "No se puede borrar el tipo de parte de trabajo. Hay algún parte de trabajo " "ligado a él." -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:22 msgid "Criterion Type List" msgstr "Lista de tipos de criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:599 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:737 msgid "Overall progress" msgstr "Progreso global" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:50 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:51 msgid "Create template from selected task" msgstr "Crear plantilla a partir de tarea seleccionada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:118 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:119 msgid "All projects" msgstr "Todos los proyectos" #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:47 -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:78 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:79 msgid "Password" msgstr "Contraseña" -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:88 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:89 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:36 msgid "Observations" msgstr "Observaciones" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:944 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:963 msgid "Edit project" msgstr "Editar proyecto" -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:26 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:23 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:24 msgid "Progress assignments" msgstr "Asignaciones de progreso" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:186 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:206 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:230 -#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:26 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:27 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:244 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:263 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:285 msgid "Valid from" msgstr "Válido desde" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:56 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:69 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:59 msgid "Month" msgstr "Mes" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:204 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:206 msgid "exception date already exists" msgstr "la fecha de excepción ya existe" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:303 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:308 msgid "There exists other template with the same name." msgstr "Ya existe otra plantilla con el mismo nombre." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:747 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:863 +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" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:758 msgid "Advanced assignment saved" msgstr "Asignación avanzada guardada" -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:54 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:30 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:55 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31 msgid "Color" msgstr "Color" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:365 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:366 msgid "Cannot insert material in general view. Please, select a category" msgstr "" "No se puede insertar material en la vista general. Por favor, seleccione una " "categoría" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:192 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:193 msgid "criterion satisfaction's start date not specified" msgstr "fecha de inicio del criterio satisfecho no especificada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:50 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:132 -#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:371 +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" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:51 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:83 #: navalplanner-webapp/src/main/webapp/planner/editTask.zul:79 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:65 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:82 -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:38 -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:42 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:68 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:131 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:166 -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:89 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:66 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:39 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:43 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:69 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:132 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:167 +#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:48 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:133 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:79 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:97 msgid "Accept" msgstr "Aceptar" @@ -5617,226 +5669,226 @@ msgstr "Aceptar" msgid "Example: {0}" msgstr "Ejemplo: {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:279 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:299 -#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:39 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:283 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:303 +#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:40 msgid "Edit Worker" msgstr "Editar trabajador" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:457 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:458 msgid "" "Create new material assignment out of material assignment {0}. Are you sure?" msgstr "" "Crear nueva asignación de material fuera de la asignación de material {0}. " "¿Está seguro?" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:192 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:151 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:167 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:193 msgid "Work report lines" msgstr "Líneas del parte de trabajo" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:48 msgid "Calculated" msgstr "Calculado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:117 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:118 msgid "Error setting up edition form for Criterion Type with id: {0}" msgstr "" "Error preparando el formulario de edición para el tipo de criterio con id: " "{0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:210 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:211 msgid "Completed: {0}% " msgstr "Completado: {0}% " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1177 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1178 msgid "Calculated progress measurement can not be removed" msgstr "Las medidas de progreso calculadas no se pueden borrar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:334 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:340 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:335 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:341 msgid " The " msgstr " El " -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:50 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:51 msgid "Access to the system" msgstr "Acceso al sistema" -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:207 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:190 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:114 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:104 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:199 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160 -#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:44 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182 msgid "Click on " msgstr "Click en" -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:60 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:61 msgid "Probability" msgstr "Probabilidad" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:111 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:99 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:115 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:112 msgid "Report data" msgstr "Datos del informe" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:43 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:44 msgid "External load" msgstr "Carga externa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:202 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:204 msgid "Progress sent successfully" msgstr "El progreso se envió con éxito" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:89 -msgid "Priority" -msgstr "Prioridad" - -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:36 -msgid "Landscape" -msgstr "Apaisado" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/InstanceNotFoundRecoverableErrorException.java:45 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/InstanceNotFoundRecoverableErrorException.java:46 msgid "instance not found" msgstr "instancia no encontrada" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:424 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:73 +msgid "Priority" +msgstr "Prioridad" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:207 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:69 +msgid "Infinitely Over Assignable" +msgstr "Sobreasignable infinitamente" + +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:425 msgid "criterion names must be unique inside a criterion type" msgstr "el nombre del criterio debe ser único dentro de un tipo de criterio" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:30 -msgid "Filters" -msgstr "Filtros" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:78 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:815 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:26 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:46 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:74 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:27 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:84 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:43 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:69 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:25 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:95 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:98 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:79 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:814 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:120 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:90 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:95 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:99 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:25 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:47 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:76 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:27 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:39 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:76 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:39 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:75 -#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:40 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:28 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:107 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:27 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:64 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:131 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:51 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:65 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:75 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:69 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:46 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:37 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:59 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:81 -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:35 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:36 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:49 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:144 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:232 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:36 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:59 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:186 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:287 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:26 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:85 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:66 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:76 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:49 +#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:40 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:114 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:76 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:26 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:52 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:65 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:132 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:37 msgid "Code" msgstr "Código" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:40 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:41 msgid "Add stretch" msgstr "Añadir tramo" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:86 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:70 msgid "Assignation type" msgstr "Tipo de asignación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:416 -msgid "Calculate Workable Days" -msgstr "Calcular días laborables" +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:33 +msgid "Show resource assignments" +msgstr "Mostrar las asignaciones de recursos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:213 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:240 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:241 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:214 msgid "" "Start date is not valid, the new start date must be lower than the end date" msgstr "" "La fecha de inicio no es válida, la fecha de inicio nueva debe ser anterior " "a la fecha de fin" -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:54 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:52 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:96 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:387 +msgid "Calculate Workable Days" +msgstr "Calcular días laborables" + #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:121 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:96 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:57 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:100 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:55 msgid "Start date" msgstr "Fecha de inicio" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:157 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:168 msgid "Update exception" msgstr "Actualizar excepción" +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:138 +msgid "Budget" +msgstr "Presupuesto" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/TreeElementOperationsController.java:253 msgid "Operation cannot be done" msgstr "No se puede efectuar la operación" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:137 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 -msgid "Budget" -msgstr "Presupuesto" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:329 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:330 msgid "Already exists other criterion with the same name" msgstr "Ya existe otro criterio con el mismo nombre" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:75 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:65 msgid "May" msgstr "Mayo" -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:36 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:37 msgid "Unit name" msgstr "Nombre de la unidad" -#: navalplanner-webapp/src/main/webapp/labels/labelTypes.zul:20 +#: navalplanner-webapp/src/main/webapp/labels/labelTypes.zul:21 msgid "NavalPlan: Labels" msgstr "NavalPlan: Etiquetas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:46 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:51 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java:44 -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:34 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:42 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:43 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48 msgid "Project code" msgstr "Código del proyecto" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:56 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:57 msgid "Write" msgstr "Escribir" -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:38 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:39 msgid "Number of applications" msgstr "Número de aplicaciones" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:496 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:499 msgid "Assign element to queue automatically" msgstr "Asignar elemento a la cola automáticamente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:81 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:82 msgid "" "Date which the task must start after (press enter in textbox to open " "calendar popup or type in date directly)" @@ -5844,22 +5896,22 @@ 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)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:295 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:529 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:42 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:326 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:604 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:43 msgid "Normal" msgstr "Normal" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:296 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:312 msgid "Date cannot be null" msgstr "La fecha no puede ser nula" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:766 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:68 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:765 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:49 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:168 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:70 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:126 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:68 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:76 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:142 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:169 msgid "Task Code" msgstr "Código de la tarea" @@ -5867,234 +5919,231 @@ msgstr "Código de la tarea" msgid "Project view" msgstr "Vista de proyecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:94 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:96 msgid "Create Profile" msgstr "Crear perfil" -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:50 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:52 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:54 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:51 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:53 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:55 msgid "Probability %" msgstr "Probabilidad %" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:746 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:747 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." -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:26 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:27 msgid "New criterion" msgstr "Criterio nuevo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:597 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:348 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:541 -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:48 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:349 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:735 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:542 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49 msgid "Load" msgstr "Carga" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:868 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:31 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:59 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:35 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:889 #: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:65 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:119 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:58 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:60 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:82 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:46 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:47 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:32 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:41 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:120 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:59 msgid "Description" msgstr "Descripción" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:71 -msgid "Expand all taskgroups" -msgstr "Expandir todos los grupos de tareas" - -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:23 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:24 msgid "NavalPlan: Criteria" msgstr "NavalPlan: Criterios" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:164 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:117 msgid "Go to advanced Allocation" msgstr "Ir a asignación avanzada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:282 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:242 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:283 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:287 msgid "Project Templates" msgstr "Plantillas de proyectos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:621 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:623 msgid "already exists an allocation for criteria {0}" msgstr "ya existe una asignación para los criterios {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:307 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:309 msgid "Forward" msgstr "Adelante" -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:42 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:43 msgid "Number of finished applications" msgstr "Número de aplicaciones finalizadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:464 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:465 msgid "Invalid queue element" msgstr "elemento de cola inválido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:574 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:583 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:591 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:575 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:584 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:592 msgid "Unnasigned" msgstr "No asignado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:402 -msgid "At least one HoursGroup is needed" -msgstr "Es necesario al menos un grupo de horas" - -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:69 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:61 -#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:156 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:70 msgid "User" msgstr "Usuario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:256 -msgid "Virtual worker" -msgstr "Trabajador virtual" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403 +msgid "At least one HoursGroup is needed" +msgstr "Es necesario al menos un grupo de horas" #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:69 msgid "Interacts with applications" msgstr "Interactúa con aplicaciones" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:330 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:257 +msgid "Virtual worker" +msgstr "Trabajador virtual" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:343 msgid "Length percentage should be between 0 and 100" msgstr "El porcentaje de duración debería estar entre 0 y 100" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:47 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:48 msgid "Multiple values per resource" msgstr "Múltiples valores por recurso" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:35 msgid "Hours:" msgstr "Horas:" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:57 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:63 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:62 msgid "Split" msgstr "Dividir" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:100 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:104 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:105 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:105 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:106 msgid "please, select a project" msgstr "por favor, seleccione un proyecto" -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:117 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:118 msgid "Supported Chrome, Firefox, Safari and Epiphany browsers" msgstr "Compatible con navegadores Chrome, Firefox, Safari y Epiphany" -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:40 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:27 -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:32 -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:67 -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:24 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:42 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:93 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:33 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:68 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:41 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:50 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:29 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:94 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:45 msgid "Starting date" msgstr "Fecha de inicio" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:33 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:64 +msgid "Add materials" +msgstr "Añadir materiales" + +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:34 msgid "Load 100%" msgstr "Carga 100%" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:979 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:990 msgid "Function" msgstr "Función" -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:198 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:160 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:187 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:168 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:92 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:141 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:82 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:179 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:198 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:139 -#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:25 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:160 msgid "Format" msgstr "Formato" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:542 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:585 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:541 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:606 msgid "New project version" msgstr "Nueva versión de proyecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:166 -msgid "Edit Unit Type" -msgstr "Editar tipo de unidad" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:473 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:81 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:530 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1231 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:471 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:306 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:34 -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:36 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:36 -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:24 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:47 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:46 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:41 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:26 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:32 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:39 -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:36 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:41 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:77 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:36 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:88 -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:23 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:46 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:24 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:47 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:43 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:332 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:77 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:474 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1250 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:472 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:532 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:44 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:37 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:42 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:37 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:33 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:24 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:47 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:48 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:104 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:37 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:78 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:25 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:39 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:35 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:25 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:49 msgid "Edit" msgstr "Editar" -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:35 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:174 +msgid "Edit Unit Type" +msgstr "Editar tipo de unidad" + #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 msgid "Init date" msgstr "Fecha de inicio" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:103 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:104 msgid "Responsible" msgstr "Responsable" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:456 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:457 msgid "percentage must be in range (0,100]" msgstr "el porcentaje debe pertenecer al rango (0,100]" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:52 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:61 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:44 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:53 msgid "New Description" msgstr "Descripción nueva" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1136 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1154 msgid "" "resources cost category assignment codes must be unique inside a resource" msgstr "" "los códigos de las asignaciones de recursos a una categoría de coste deben " "ser únicos dentro de un recurso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:159 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:162 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:160 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:164 msgid "XML" msgstr "XML" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:186 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:187 msgid "" "CriterionType is not valid, the criterionType overlap other " "criterionSatisfaction whith same criterionType" @@ -6102,103 +6151,96 @@ msgstr "" "El tipo de criterio no es válido, el tipo se solapa con otro criterio " "satisfecho con el mismo tipo" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:60 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:61 msgid "Unable to convert {0} value to {1} type" msgstr "No se pudo convertir el valor {0} al tipo {1}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:197 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:198 msgid "Tree {0} sucessfully flattened" msgstr "Árbol {0} aplanado satisfactoriamente" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:110 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:31 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:83 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:30 msgid "Unit price" msgstr "Precio de la unidad" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:68 -msgid "Project Code" -msgstr "Código del proyecto" - -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46 msgid "Communication date" msgstr "Fecha de comunicación" -#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:29 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:68 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:72 +msgid "Project Code" +msgstr "Código del proyecto" + +#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:30 msgid "Reassigning" msgstr "Reasignando" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:519 +#: navalplanner-webapp/src/main/java/org/navalplanner/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." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:595 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:596 msgid "{0} already assigned to resource allocation list" msgstr "{0} ya está en la lista de asignación de recursos" -#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:26 +#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:27 msgid "Unit Measure" msgstr "Unidad de medida" -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:21 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:22 msgid "Label Types List" msgstr "Lista de Tipos de Etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:414 -msgid "The type of hours cannot be null." -msgstr "El tipo de horas no puede ser nulo." - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:343 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:347 msgid "{0} projects reassignation remaining" msgstr "quedan {0} proyectos por reasignar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:51 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:52 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionBandboxFinder.java:44 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:50 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:48 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:46 -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:58 -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:35 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:24 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:41 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:26 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:51 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:148 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:117 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:157 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:137 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:178 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:99 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:140 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:95 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:125 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:165 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:107 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:148 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:77 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:46 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:152 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:41 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:41 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:63 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:127 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:42 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:196 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:42 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:46 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:98 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:232 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:25 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:36 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:33 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:48 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:42 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:64 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:128 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:59 msgid "Type" msgstr "Tipo" -#: navalplanner-webapp/src/main/webapp/planner/_contentOverallProgress.zul:59 -msgid "Refresh" -msgstr "Actualizar" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:631 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:637 msgid "" "This machine cannot be deleted because it has assignments to projects or " "imputed hours" @@ -6206,17 +6248,17 @@ msgstr "" "Esta máquina no se puede borrar porque tiene asignaciones a proyectos u " "horas imputadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:81 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:71 msgid "November" msgstr "Noviembre" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:121 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:122 msgid "BCWS" msgstr "BCWS" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1287 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1309 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1288 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1310 msgid "" "Value is not valid, the value must be greater than the value of the previous " "progress." @@ -6228,54 +6270,58 @@ msgstr "" msgid " in the specified directory." msgstr " en el directorio especificado." -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1130 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1148 msgid "criterion satisfaction codes must be unique inside a resource" msgstr "el código del criterio debe ser único dentro de un recurso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:844 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:662 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:862 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:668 msgid "no" msgstr "no" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:359 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:360 msgid "missing code in a work report." msgstr "falta el código en un parte de trabajo." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:35 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:28 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:29 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:29 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:29 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:36 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:85 msgid "Criterion" msgstr "Criterio" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:94 +msgid "unl" +msgstr "ili" + #: navalplanner-webapp/src/main/webapp/common/configuration.zul:76 msgid "Generate code for" msgstr "Generar código para" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/impl/LabelConverter.java:102 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:396 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:480 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/impl/LabelConverter.java:103 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:397 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:481 msgid "missing code in a label" msgstr "falta el código en una etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:122 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:123 msgid "Actual Cost Work Performed" msgstr "Coste de trabajo realizado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:182 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:184 msgid "Create project from Template" msgstr "Crear proyecto a partir de plantilla" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:265 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:310 msgid "NavalPlan Configuration" msgstr "NavalPlan: Configuración" -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:50 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:51 msgid "Average of the worked hours" msgstr "Media de horas trabajadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:405 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:406 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" @@ -6285,16 +6331,16 @@ msgstr "" " El código no puede contener caracteres como '_' \n" " y no debe ser vacío" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorization.java:42 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorization.java:43 msgid "an authorization type must be set" msgstr "debe seleccionar un tipo de autorización" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:91 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:92 msgid "Must start after (days since beginning project)" msgstr "Debe empezar después de (días desde el inicio del proyecto)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:541 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:584 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:540 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:605 msgid "" "Confirm creating a new project version for this scenario and derived. Are " "you sure?" @@ -6302,49 +6348,50 @@ msgstr "" "Confirmar la creación de una nueva versión del proyecto para este escenario " "y sus derivados. ¿Está seguro?" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:149 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:77 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:113 -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:28 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:29 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:167 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:88 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:129 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:85 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:115 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:154 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:86 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:150 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:96 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:137 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:86 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:77 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:146 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:167 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:88 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:165 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:88 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:129 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:68 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:29 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:44 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:74 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:66 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:59 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166 msgid "Add" msgstr "Añadir" #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:124 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:73 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:85 msgid "Unselect" msgstr "Deseleccionar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:543 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:618 msgid "You should select the type of exception" msgstr "Debe seleccionar el tipo de excepción" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:92 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:45 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:98 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:93 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:56 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:30 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:51 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:99 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 msgid "Deadline" msgstr "Fecha límite" @@ -6352,66 +6399,62 @@ msgstr "Fecha límite" msgid "Filter by categories or materials" msgstr "Filtrar por categorías o materiales" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:253 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:298 msgid "Subcontracted Tasks" msgstr "Tareas subcontratadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:369 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:389 msgid "Amount work percentage should be between 0 and 100" msgstr "El porcentaje de cantidad de trabajo debe estar entre 0 y 100" -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:29 msgid "Machine data" msgstr "Datos de la máquina" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:127 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:128 msgid "VAC" msgstr "VAC" -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:27 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:33 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:54 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:55 msgid "Label type" msgstr "Tipo de etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:228 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:298 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:242 -msgid "Advanced Allocation" -msgstr "Asignación avanzada" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:264 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:309 msgid "Administration / Management" msgstr "Administración / Gestión" -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:92 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:246 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:319 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:243 +msgid "Advanced Allocation" +msgstr "Asignación avanzada" + +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:93 msgid "Number of iterations" msgstr "Número de iteraciones" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:59 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:60 msgid "Template Tree" msgstr "Árbol de plantillas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:326 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:329 msgid "Criterion has subelements" msgstr "El criterio tiene subelementos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:527 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:33 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:499 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:34 msgid "Alpha" msgstr "Alfa" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:162 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:203 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:163 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:204 msgid "inconsistent parent code." msgstr "código padre inconsistente." -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:67 -msgid "Recommended Allocation" -msgstr "Asignación recomendada" - #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:67 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:33 msgid "Status" msgstr "Estado" @@ -6419,61 +6462,59 @@ msgstr "Estado" msgid "Resource load view" msgstr "Vista de carga de recursos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:973 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:81 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:61 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:69 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:807 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:68 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:75 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:49 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:88 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:53 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:47 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:128 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:33 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:73 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:82 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:70 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:806 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:62 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:69 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:76 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:34 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:54 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:72 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:37 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:154 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:35 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:84 msgid "Hours" msgstr "Horas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:630 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:768 msgid "the date must be inside the visualization area" msgstr "la fecha debe estar dentro del área de visualización" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:404 -msgid "work report has not this label type assigned" -msgstr "el parte de trabajo no tiene asignado este tipo de etiqueta" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1220 -msgid "Limiting assignment" -msgstr "Asignación limitante" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:521 -msgid "date not specified." -msgstr "fecha no especificada." - -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:53 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:54 msgid "Quality form type" msgstr "Tipo de formulario de calidad" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:343 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:405 +msgid "work report has not this label type assigned" +msgstr "el parte de trabajo no tiene asignado este tipo de etiqueta" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1229 +msgid "Limiting assignment" +msgstr "Asignación limitante" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:522 +msgid "date not specified." +msgstr "fecha no especificada." + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:344 msgid "The name of the criterion is empty." msgstr "El nombre del criterio está vacío." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:359 -msgid " hours" -msgstr " horas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:133 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:146 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:241 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:147 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:281 msgid "Limiting Resources Planning" msgstr "Asignación de recursos limitantes" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:769 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:360 +msgid " hours" +msgstr " horas" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:770 msgid "The max value must be not empty" msgstr "el valor máximo no puede ser vacío" @@ -6481,38 +6522,34 @@ msgstr "el valor máximo no puede ser vacío" msgid "New label" msgstr "Nueva etiqueta" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:133 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:134 msgid "Worker ID cannot be empty" msgstr "NIF del trabajador no especificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:342 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:351 -msgid "The start date cannot be null" -msgstr "La fecha de inicio no puede ser nula" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:176 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:177 msgid "All project tasks" msgstr "Todas las tareas del proyecto" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:77 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:72 -msgid "Allocation configuration" -msgstr "Configuración de asignación" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:352 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:343 +msgid "The start date cannot be null" +msgstr "La fecha de inicio no puede ser nula" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:124 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:125 msgid "Scenario \"{0}\" saved" msgstr "Escenario \"{0}\" guardado" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:214 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:173 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:27 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:78 +msgid "Allocation configuration" +msgstr "Configuración de asignación" + +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:189 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:215 msgid "Save & New work report" msgstr "Guardar y nuevo parte de trabajo" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:51 -msgid "Subcontract price" -msgstr "Precio de subcontratación" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:147 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:148 msgid "" "Some entity sequence was created during the configuration process, it is " "impossible to update entity sequence table. Please, try again later" @@ -6521,624 +6558,184 @@ msgstr "" "imposible actualizar la tabla de secuencia de entidad. Por favor, inténtelo " "de nuevo más tarde" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:584 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:52 +msgid "Subcontract price" +msgstr "Precio de subcontratación" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:739 msgid "Resources per day are zero" msgstr "Hay cero recursos por día" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:30 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:23 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:30 msgid "Assigned criteria" msgstr "Criterios asignados" -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:52 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:53 msgid "Help on authentication (opens a new window)" msgstr "Ayuda sobre la identificación (abre una ventana nueva)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:869 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/EffortDurationBox.java:39 +msgid "Not a valid effort duration" +msgstr "No es una duración de esfuerzo válida" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:870 msgid "The length must be greater than 0, and not null." msgstr "La longitud debe ser mayor que cero y no nula." -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:65 -msgid "2011" -msgstr "2011" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:504 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:536 msgid "Could not save new calendar" msgstr "No se pudo guardar el calendario nuevo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1384 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1404 msgid "Sigmoid function applied to current resource" msgstr "Función sigmoide aplicada al recurso actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:152 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:160 msgid "Deleted unit type {0}" msgstr "Borrado tipo de unidad {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:224 msgid "Could not save the scenario" msgstr "No se pudo guardar el escenario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:135 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:136 msgid "Couldn't find criterion {0}" msgstr "No se pudo encontrar el criterio {0}" -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:32 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:36 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:37 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:33 +#: navalplanner-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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:293 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:338 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41 msgid "Task Scheduling Status In Project" msgstr "Estado de planificación de tareas en un proyecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:322 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:355 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:175 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:199 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:344 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:372 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:421 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:194 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:345 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:373 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:356 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:888 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:200 msgid "Confirm" msgstr "Confirmar" -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:48 -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:44 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:47 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:32 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:42 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:50 -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:48 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:54 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:55 -#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:31 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:57 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:59 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:56 -#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:31 -#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:31 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:57 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:48 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:55 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:43 +#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:32 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:58 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:32 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:32 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:56 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:33 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:47 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:49 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:61 msgid "Create" msgstr "Crear" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1705 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1711 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1728 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1734 msgid "please, select a work report type" msgstr "por favor, seleccione un tipo de parte de trabajo" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:43 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67 msgid "Permissions" msgstr "Permisos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:485 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:486 msgid "List of materials for category: {0}" msgstr "Lista de materiales para la categoría {0}" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:32 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:31 msgid "Total price" msgstr "Precio total" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:947 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:953 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:381 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:711 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:179 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:137 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:321 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:800 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:619 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:231 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:293 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:461 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:475 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:142 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:162 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1247 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1203 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:199 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:331 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:404 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:387 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1207 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1219 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:435 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:203 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:270 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:291 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:125 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:711 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:971 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1220 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:377 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:90 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:120 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:39 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:66 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:41 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:90 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:54 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:52 -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:87 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:51 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:89 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:68 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:116 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:131 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:44 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:106 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:147 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:188 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:109 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:150 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:135 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:175 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:107 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:232 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:126 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:362 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:530 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:544 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:163 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:818 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:625 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:138 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:324 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:948 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:954 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:271 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:292 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:787 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1045 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1296 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:419 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:408 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:694 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1266 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:388 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:332 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:405 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1204 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1230 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1242 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:436 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:223 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:117 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:158 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:127 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:106 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:147 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:188 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:110 -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:41 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:46 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:90 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:101 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:78 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:66 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:60 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:83 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:42 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:109 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:150 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:49 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:92 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:46 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:88 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:69 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:117 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:132 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:104 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:114 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:51 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:52 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:48 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:115 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:53 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:59 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:213 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:84 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:40 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:90 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:120 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:66 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:54 msgid "Delete" msgstr "Borrar" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:98 -msgid "There are no days available due to not satisfying the criterions." -msgstr "No hay días disponibles por no satisfacer los criterios." - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:99 -msgid "" -"Another possibility is that the resources don't have days available due to " -"their calendars." -msgstr "" -"Otra posibilidad es que los recursos no tengan días disponibles debido a sus " -"calendarios." - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:105 -msgid "" -"There are no days available in the days marked available by the task " -"calendar." -msgstr "" -"No hay días disponibles en los días marcados disponibles por el calendario " -"de tareas." - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:106 -msgid "Maybe the criterions are not satisfied in those days." -msgstr "Quizá los criterios no se satisfacen en esas fechas." - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:170 -msgid "" -"The resource's calendar has no available days starting from the start of the " -"task." -msgstr "" -"El calendario del recurso no tiene días disponibles que comiencen desde el " -"inicio de la tarea." - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:175 -msgid "" -"There are no days available at resource's calendar in the days marked " -"available by the task's calendar." -msgstr "" -"No hay días disponibles en el calendario del recurso en los días marcados " -"disponibles por el calendario de la tarea." - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:27 -msgid "Finished" -msgstr "Terminado" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:28 -msgid "In progress" -msgstr "En progreso" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:29 -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31 -msgid "Pending" -msgstr "Pendiente" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:30 -msgid "Blocked" -msgstr "Bloqueado" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31 -msgid "Failed sent" -msgstr "Fallo en el envío" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:32 -msgid "Success sent" -msgstr "Éxito en el envío" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AssignmentFunction.java:57 -msgid "None" -msgstr "Ninguno" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AssignmentFunction.java:58 -msgid "Stretches" -msgstr "Tramos" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AssignmentFunction.java:59 -msgid "Interporlation" -msgstr "Interpolación" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AssignmentFunction.java:60 -msgid "Sigmoid" -msgstr "Sigmoide" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueDependency.java:169 -msgid "A queue dependency has to have an origin different from destiny" -msgstr "Una dependencia en la cola debe tener un origen distinto del destino" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/QueuePosition.java:52 -msgid "Hour should be a value between 0 and 23" -msgstr "La hora debe ser un valor entre 0 y 23" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:33 -msgid "Web service reader" -msgstr "Lectura de servicios web" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:34 -msgid "Web service writer" -msgstr "Escritura de servicios web" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:35 -msgid "All projects read allowed" -msgstr "Permitida lectura de todos los proyectos" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:36 -msgid "All projects edition allowed" -msgstr "Permitida edición de todos los proyectos" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:37 -msgid "Project creation allowed" -msgstr "Permitida creación de proyectos" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:32 -msgid "Read authorization" -msgstr "Autorización de lectura" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:33 -msgid "Write authorization" -msgstr "Autorización de escritura" - -#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java:121 -msgid "Line" -msgstr "Línea" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:34 -msgid "WORK_RELATIONSHIP" -msgstr "RELACIÓN_LABORAL" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:40 -msgid "LOCATION_GROUP" -msgstr "GRUPO_LOCALIZACIÓN" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:47 -msgid "MACHINE LOCATION_GROUP" -msgstr "GRUPO_LOCALIZACIÓN MÁQUINAS" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:55 -msgid "LEAVE" -msgstr "BAJA" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:61 -msgid "TRAINING" -msgstr "FORMACIÓN" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:67 -msgid "JOB" -msgstr "PUESTO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:73 -msgid "CATEGORY" -msgstr "CATEGORÍA" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:31 -msgid "WORKER" -msgstr "TRABAJADOR" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:32 -msgid "MACHINE" -msgstr "MÁQUINA" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:161 -msgid "[generic all machines]" -msgstr "[genérico todas las máquinas]" - -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:106 -msgid "Hours cost type cannot be empty or null" -msgstr "El coste de las horas no puede ser vacío o nulo" - -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:115 -msgid "Init date cannot be empty or null" -msgstr "La fecha de inicio no puede ser vacía o nula" - -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:120 -msgid "End date cannot be empty or null" -msgstr "La fecha de fin no puede ser vacía o nula" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ProgressType.java:35 -msgid "Progress with all task tasks by hours" -msgstr "Avance con todas las tareas por horas" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ProgressType.java:36 -msgid "Progress with critical path tasks by hours" -msgstr "Avance con tareas del camino crítico por horas" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ProgressType.java:37 -msgid "Progress with critical path tasks by duration" -msgstr "Avance con tareas del camino crítico por duración" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/EntitySequence.java:89 -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/EntitySequence.java:130 -msgid "You can not modifiy this order sequence, it is already in use" -msgstr "No se puede modificar esta secuencia de proyecto, ya está siendo usada" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/EntitySequence.java:139 -#, java-format -msgid "number of digits must be between {0} and {1}" -msgstr "el número de dígitos debe estar entre {0} y {1}" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/daos/EntitySequenceDAO.java:81 -msgid "You can not remove this order sequence, it is already in use" -msgstr "No se puede borrar esta secuencia de proyecto, ya está siendo usada" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java:893 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:653 -msgid "Cannot spread two progress in the same task" -msgstr "No puede haber dos tipos de progreso que propagan en la misma tarea" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:168 -#, java-format -msgid "{0} is already child of another {1}" -msgstr "{0} ya es hijo de otro {1}" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:214 -msgid "it's already somewhat scheduled" -msgstr "ya está planificado de alguna manera" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:228 -msgid "it can't be unscheduled" -msgstr "no se puede quitar la planificación" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:366 -msgid "Completely scheduled" -msgstr "Completamente planificado" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:368 -msgid "Partially scheduled" -msgstr "Parcialmente planificado" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:370 -msgid "Unscheduled" -msgstr "No planificado" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:376 -msgid "C" -msgstr "C" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:378 -msgid "P" -msgstr "P" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:380 -msgid "U" -msgstr "N" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 -msgid "OFFERED" -msgstr "OFERTADO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 -msgid "ACCEPTED" -msgstr "ACEPTADO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 -msgid "STARTED" -msgstr "EMPEZADO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 -msgid "FINISHED" -msgstr "TERMINADO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 -msgid "CANCELLED" -msgstr "CANCELADO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 -msgid "SUBCONTRACTED PENDING PROJECT" -msgstr "PROYECTO PENDIENTE SUBCONTRATADO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 -msgid "STORED" -msgstr "ALMACENADO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:574 -msgid "" -"Some ancestor has the same label assigned, so this element is already " -"inheriting this label" -msgstr "" -"Algún antecesor tiene la misma etiqueta asignada, así que este elemento ya " -"está heredando esa etiqueta" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:677 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:703 -msgid "Duplicate Progress Assignment For Task" -msgstr "Asignación de progreso duplicada para la tarea" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:1336 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:1346 -#, java-format -msgid "Repeated Project code {0} in Project {1}" -msgstr "Código de proyecto {0} repetido en el proyecto {1}" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:259 -msgid "workHours should be greater or equals to 0" -msgstr "Las horas de trabajo deben ser mayores o iguales a cero" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:271 -msgid "" -"\"workHours\" value is not valid, taking into account the current list of " -"HoursGroup" -msgstr "" -"El valor de horas de trabajo no es válido, teniendo en cuenta la lista " -"actual de grupos de horas" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:180 -msgid "Working hours shouldn't be negative" -msgstr "Las horas de trabajo no pueden ser negativas" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:209 -msgid "Total percentage should be less than 100%" -msgstr "El porcentaje total debe ser menor que 100%" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:258 -#, java-format -msgid "" -" The criterion {0} can not be assigned to this hoursGroup because its " -"resource type is diferent." -msgstr "" -" El criterio {0} no se puede asignar a este grupo de horas porque su tipo de " -"recurso es diferente." - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:264 -#, java-format -msgid "" -" The criterion {0} can not be assigned to this hoursGroup because it " -"already exist into the hoursGroup." -msgstr "" -" El criterio {0} no se puede asignar a este grupo de horas porque ya existe " -"en el grupo." - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:420 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:430 -#, java-format -msgid "Repeated Hours Group code {0} in Project {1}" -msgstr "Código de grupo de horas {0} repetido en el proyecto {1}" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java:539 -#, java-format -msgid " The {0} already exist into other task" -msgstr " El {0} ya existe en otra tarea" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:30 -msgid "Number of assigned hours" -msgstr "Número de horas asignadas" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:31 -msgid "Number of hours calculated by clock" -msgstr "Número de horas calculado basado en reloj" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:32 -msgid "Number of assigned hours and the time" -msgstr "Número de horas asignadas y hora" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:33 -msgid "heading" -msgstr "cabecera" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:33 -msgid "line" -msgstr "línea" - -#: navalplanner-business/src/main/java/org/navalplanner/business/scenarios/entities/Scenario.java:175 -#, java-format -msgid "Derived from {0}" -msgstr "Derivado de {0}" - -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:31 -msgid "RECEIVED" -msgstr "RECIBIDO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:32 -msgid "PENDING" -msgstr "PENDIENTE" - -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:33 -msgid "ORDERED" -msgstr "PEDIDO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:34 -msgid "PROCESSING" -msgstr "PROCESANDO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:35 -msgid "CANCELED" -msgstr "CANCELADO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/QualityFormType.java:28 -msgid "by percentage" -msgstr "por porcentaje" - -#: navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/QualityFormType.java:28 -msgid "by items" -msgstr "por ítems" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java:119 -msgid "Yes" -msgstr "Sí" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java:119 -msgid "No" -msgstr "No" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java:81 -msgid "Monday" -msgstr "Lunes" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java:81 -msgid "Tuesday" -msgstr "Martes" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java:81 -msgid "Wednesday" -msgstr "Miércoles" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java:82 -msgid "Thursday" -msgstr "Jueves" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java:82 -msgid "Friday" -msgstr "Viernes" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java:82 -msgid "Saturday" -msgstr "Sábado" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java:83 -msgid "Sunday" -msgstr "Domingo" - -#~ msgid "" -#~ "Still not saved changes would be lost. Are you sure you want to go to " -#~ "create a template?" -#~ msgstr "" -#~ "Los cambios que no hayan sido guardados se perderán. ¿Está seguro de que " -#~ "quiere ir a la creación de plantillas?" - -#~ msgid "" -#~ "Templates can only be created from already existent tasks.\n" -#~ "Newly tasks cannot be used." -#~ msgstr "" -#~ "Las plantillas sólo pueden crearse a partir de tareas existentes.\n" -#~ "No se pueden usar tareas nuevas." - -#~ msgid "Choose a task to operate on it" -#~ msgstr "Elija una tarea para operar sobre ella" diff --git a/navalplanner-webapp/src/main/resources/i18n/gl.po b/navalplanner-webapp/src/main/resources/i18n/gl.po index 651ef03d2..53d813c44 100644 --- a/navalplanner-webapp/src/main/resources/i18n/gl.po +++ b/navalplanner-webapp/src/main/resources/i18n/gl.po @@ -8,10 +8,10 @@ # msgid "" msgstr "" -"Project-Id-Version: 1.0.4\n" +"Project-Id-Version: 1.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-08 10:41+0200\n" -"PO-Revision-Date: 2011-04-08 11:03+0200\n" +"POT-Creation-Date: 2011-05-11 18:16+0200\n" +"PO-Revision-Date: 2011-05-11 19:53+0200\n" "Last-Translator: Manuel Rego Casasnovas \n" "Language-Team: Galician <>\n" "Language: gl\n" @@ -20,351 +20,338 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:350 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:368 msgid "The resource cannot be null" msgstr "O recurso non pode ser nulo" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:418 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:419 msgid "criterion codes must be unique inside a criterion type" msgstr "o código do criterio debe ser único dentro dun tipo de criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:95 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:96 msgid "No authorizations were added because you did not select any." msgstr "Non se engadiron actualizacións porque non se seleccionou ningunha." -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:95 -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:44 -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:53 -#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:70 -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:50 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:88 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:45 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:54 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:58 +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:71 msgid "en" msgstr "gl" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:154 -msgid "Create exception" -msgstr "Crear excepción" - -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:145 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:188 msgid "Origin" msgstr "Orixe" +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:165 +msgid "Create exception" +msgstr "Crear excepción" + #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:45 msgid "Select report data" msgstr "Seleccione data do informe" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:389 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:399 msgid "Up to company view" msgstr "Arriba á vista da compañía" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:206 +#: navalplanner-webapp/src/main/java/org/navalplanner/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}" -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:59 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:60 msgid "Create Virtual Worker" msgstr "Crear traballador virtual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:97 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:821 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:140 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:130 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:27 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:75 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29 -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:39 -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:38 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:33 -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:43 -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:36 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:39 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:38 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:28 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:97 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:139 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:180 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:101 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:142 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:99 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:127 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:98 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:820 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:109 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:150 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:122 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:91 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:119 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:159 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:97 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:139 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:180 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:101 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:101 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:142 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:77 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:28 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:231 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:35 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:158 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:68 -#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:37 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:39 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:61 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:87 -#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:28 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:146 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:233 -#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:29 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:269 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:34 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:39 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:40 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:50 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:51 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:54 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:69 +#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:141 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:50 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:36 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:57 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:50 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:48 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:28 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:135 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:159 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:36 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:52 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:231 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35 msgid "Operations" msgstr "Operacións" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:29 -msgid "Add criterion" -msgstr "Engadir criterio" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:134 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:194 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:149 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:535 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:135 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:195 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:150 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:536 msgid "There is no type of work hours with this code" msgstr "Non hai un tipo de horas de traballo con este código" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:100 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:154 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:107 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:84 msgid "Select" msgstr "Seleccionar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:355 -msgid "there must be {0} hours instead of {1}" -msgstr "debe haber {0} horas en lugar de {1}" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1280 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1356 msgid "It can not be empty" msgstr "Non pode estar baleiro" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:270 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:21 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:65 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:52 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:144 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:54 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:33 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:88 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:21 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:315 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:33 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:66 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:98 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:53 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:145 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:55 msgid "Materials" msgstr "Materiais" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:293 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:360 msgid "Reassign" msgstr "Reasignar" -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:61 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:62 msgid "Description cannot be null or empty" msgstr "A descrición non pode ser nula ou baleira" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:78 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:79 msgid "login name not specified" msgstr "nome de usuario non especificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MonteCarloTabCreator.java:78 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MonteCarloTabCreator.java:354 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MonteCarloTabCreator.java:79 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MonteCarloTabCreator.java:356 msgid "MonteCarlo Method" msgstr "Método de Montecarlo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:291 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:309 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:292 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:310 msgid "Project Scheduling" msgstr "Planificación de proxecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:41 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:72 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:62 msgid "February" msgstr "Febreiro" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:27 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:28 msgid "Managing fields and labels" msgstr "Administrar campos e etiquetas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:355 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:356 msgid "Please, select a calendar" msgstr "Por favor, seleccione un calendario" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:188 -msgid "Summary" -msgstr "Resumo" - -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28 -#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:161 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29 msgid "Predefined" msgstr "Predefinido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:271 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:66 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:267 +msgid "Summary" +msgstr "Resumo" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:316 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:67 msgid "Quality Forms" msgstr "Formularios de calidade" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:285 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:330 msgid "Reports" msgstr "Informes" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:167 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:168 msgid "The {0} sequence prefixes can not be repeated" msgstr "Os prefixos da secuencia de {0} non poden repetirse" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:80 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:81 msgid "Criterion requirements" msgstr "Criterios requiridos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:95 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:97 msgid "START_NOT_EARLIER_THAN" msgstr "COMEZAR_NON_ANTES_DE" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:216 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:287 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: " -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:65 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:66 msgid "Dedication chart" msgstr "Gráfico de dedicación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:700 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:727 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:701 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:728 msgid "Progress that are reported by quality forms can not be modified" msgstr "O avance notificado por formularios de calidade non se pode modificar" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:747 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:748 msgid "Not the same hours group, impossible to update" msgstr "Non están no mesmo grupo de horas, imposible actualizar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:519 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:43 +#: navalplanner-webapp/src/main/webapp/common/error.zul:48 +msgid "Stacktracke:" +msgstr "Stacktracke:" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:520 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." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:472 -msgid "Remove limiting resource element" -msgstr "Borrar elemento de recurso limitante" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:140 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:154 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:240 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:141 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:155 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:275 msgid "Resource Usage" msgstr "Uso de recursos" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:38 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:475 +msgid "Remove limiting resource element" +msgstr "Borrar elemento de recurso limitante" + +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:39 msgid "Active period from" msgstr "Período activo desde" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:51 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:52 msgid "hours type :" msgstr "tipo de horas :" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:480 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:481 msgid "Unassign" msgstr "Desasignar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:250 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:295 msgid "Companies" msgstr "Empresas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:504 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:505 msgid "Manual assignment" msgstr "Asignación manual" -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:72 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:73 msgid "Quality form items list" msgstr "Lista de elementos do formulario de calidade" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:239 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:217 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:218 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:240 msgid "" "End date is not valid, the new end date must be later the current end date" msgstr "" "A data de fin non é válida, a nova data de fin debe ser posterior á actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:45 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:51 msgid "generic workers allocation" msgstr "Asignación xenérica de traballadores" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:63 -msgid "Select print visualization options" -msgstr "Seleccione as opcións de impresión da visualización" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:797 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:796 msgid "Hour start" msgstr "Hora de inicio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:896 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:515 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:516 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:915 msgid "The project has no scheduled elements" msgstr "O proxecto no ten elementos planificados" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:119 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:52 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:35 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:53 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:36 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:120 msgid "Start" msgstr "Comezo" -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:33 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:34 msgid "Progress Report" msgstr "Informe de progreso" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:118 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:119 msgid "cost assignment's category not specified" msgstr "categoría da asignación de custo non especificada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:71 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:72 msgid "Delete Template element" msgstr "Borrar elemento de modelo" -#: navalplanner-webapp/src/main/webapp/planner/order.zul:89 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:96 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:90 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:97 msgid "Progress Consolidation" msgstr "Consolidación de progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/services/DBUserDetailsService.java:65 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/services/DBUserDetailsService.java:66 msgid "User with login name '{0}': not found" msgstr "Usuario con login '{0}': non atopado" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:36 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:37 msgid "Resources capability" msgstr "Capacidade de recursos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:155 +#: navalplanner-webapp/src/main/java/org/navalplanner/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" -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:25 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26 msgid "Filter quality forms by :" msgstr "Filtrar formularios de calidade por :" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:260 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:31 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:305 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:32 msgid "Transfer Projects Between Scenarios" msgstr "Transferir proxectos entre escenarios" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:102 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:106 msgid "changing perspective" msgstr "cambio de perspectiva" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:123 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:124 msgid "" "Could not add those authorizations to profile {0} because they were already " "present." @@ -376,24 +363,25 @@ msgstr "" msgid "Default calendar" msgstr "Calendario por defecto" -#: navalplanner-webapp/src/main/webapp/users/profiles.zul:22 +#: navalplanner-webapp/src/main/webapp/users/profiles.zul:23 msgid "NavalPlan: Profiles" msgstr "NavalPlan: Perfís" -#: navalplanner-webapp/src/main/webapp/common/error.zul:20 -msgid "NavalPlan: Error" -msgstr "NavalPlan: Erro" - -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:74 msgid "Project Name" msgstr "Nome do proxecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:930 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:303 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:306 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:931 msgid "Indent" msgstr "Indentar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:575 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:255 +msgid "Reassignation" +msgstr "Reasignación" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:730 msgid "" "The periods available depend on the satisfaction of the criterions by the " "resources and their calendars." @@ -401,40 +389,44 @@ msgstr "" "Os períodos dispoñibles dependen da satisfacción dos criterios polos " "recursos e os seus calendarios." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:50 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:42 msgid "New template" msgstr "Novo modelo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:127 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:38 +msgid "Total estimated hours" +msgstr "Horas estimadas totais" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:130 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:144 msgid "Base calendar \"{0}\" saved" msgstr "Calendario base \"{0}\" gardado" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:174 +msgid "Exceptions list" +msgstr "Lista de excepcións" + +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:32 msgid "Locations" msgstr "Ubicacións" -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:75 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:76 msgid "New quality form item" msgstr "Novo elemento de formulario de calidade" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:145 -msgid "For interpolation at least two stretches are needed" -msgstr "Para a interpolación necesítanse alo menos dous tramos" - #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:41 msgid "Login name" msgstr "Nome de usuario" -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:42 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:43 msgid "Current" msgstr "Actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:626 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:632 msgid "Machine deleted" msgstr "Máquina borrada" -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:21 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:22 msgid "NavalPlan: Progress Report" msgstr "NavalPlan: Informe de progreso" @@ -442,15 +434,15 @@ msgstr "NavalPlan: Informe de progreso" msgid "Dependencies" msgstr "Dependencias" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:185 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:187 msgid "missing code in a calendar exception" msgstr "falta código nunha excepción de calendario" -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:85 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:78 msgid "Current selection" msgstr "Selección actual" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1116 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1134 msgid "" "there exist criterion satisfactions referring to criterion types not " "applicable to this resource" @@ -458,39 +450,47 @@ msgstr "" "existen criterios satisfeitos que pertencen a tipos de criterio non " "aplicables a este recurso" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:64 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:52 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:65 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:50 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:53 msgid "Criterion Requirement" msgstr "Criterio requirido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:62 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:31 +msgid "Show labels" +msgstr "Mostrar etiquetas" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:63 msgid "Minutes" msgstr "Minutos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:131 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:132 msgid "You can not remove a scenario with derived scenarios" msgstr "Non se pode borrar un escenario con escenarios derivados" -#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:22 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:23 msgid "Create new version" msgstr "Crear versión nova" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:293 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/ResourceAllocationBehaviour.java:65 +msgid "LIMITING" +msgstr "LIMITANTE" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:324 msgid "Derived" msgstr "Derivado" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:349 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:414 msgid "a disabled resource has enabled subresources" msgstr "un recurso deshabilitado ten subrecursos habilitados" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:28 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:51 msgid "Client" msgstr "Cliente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:152 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:613 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:153 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:614 msgid "" "there are no resources for required criteria: {0}. So the generic allocation " "can't be added" @@ -498,36 +498,44 @@ msgstr "" "non hai recursos cos criterios solicitados: {0}. Por tanto, non se pode " "engadir a asignación xenérica" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:427 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:446 +msgid "Error on showing warning message removing calendar: " +msgstr "Erro ao mostrar mensaxe de advertencia borrando un calendario: " + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:428 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" -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java:152 +#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java:153 msgid "material category name has to be unique. It is already used" msgstr "o nome da categoría de materiais debe ser único. Xa está en uso" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:43 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:108 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:46 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109 msgid "Imputed hours" msgstr "Horas imputadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:292 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:337 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:41 msgid "Project Costs Per Resource" msgstr "Custos do proxecto por recurso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:461 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:142 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:530 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 msgid "Confirm deleting this hour cost. Are you sure?" msgstr "Confirmar o borrado deste custo por hora. ¿Está seguro?" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/DeleteMilestoneCommand.java:58 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/DeleteMilestoneCommand.java:59 msgid "Delete Milestone" msgstr "Borrar fito" -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:47 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:152 +msgid "default password were not changed" +msgstr "o contrasinal por defecto non foi cambiado" + +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:48 msgid "Non-assigned locations" msgstr "Ubicacións non asignadas" @@ -535,7 +543,7 @@ msgstr "Ubicacións non asignadas" msgid "Application URI" msgstr "URI da aplicación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:417 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:418 msgid "" "The {0} is not valid, criterionType overlaps with other " "criterionSatisfaction from the same criterionType" @@ -543,93 +551,97 @@ msgstr "" "{0} non é válido, criterionType solápase con outro criterionSatisfaction do " "mesmo criterionType" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:286 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:331 msgid "Work Report Lines" msgstr "Liñas do parte de traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1446 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1466 msgid "Configure" msgstr "Configurar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:80 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:70 msgid "October" msgstr "Outubro" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:56 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:57 msgid "First name" msgstr "Nome" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:245 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:252 msgid "Could not execute print command" msgstr "Non se puido executar o comando de impresión" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:118 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:119 msgid "Complementary text fields" msgstr "Campos de texto complementario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:179 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:136 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:850 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:198 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:198 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1219 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:133 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:290 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:124 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:376 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:137 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:291 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:141 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:418 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:852 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:199 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:208 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1242 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:181 msgid "Confirm deleting {0}. Are you sure?" msgstr "Confirmar o borrado de {0}. ¿Está seguro?" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:36 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:37 msgid "Work Reports List" msgstr "Lista de partes de traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:267 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:312 msgid "Accounts" msgstr "Contas" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:46 -msgid "Edit selected task" -msgstr "Editar tarefa seleccionada" - -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:84 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:85 msgid "External code" msgstr "Código externo" -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:38 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:37 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:96 -msgid "Limiting" -msgstr "Limitante" +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:47 +msgid "Edit selected task" +msgstr "Editar tarefa seleccionada" -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:48 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:49 msgid "View" msgstr "Ver" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:309 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:88 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:39 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:38 +msgid "Limiting" +msgstr "Limitante" + +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:61 +msgid "Required materials" +msgstr "Materiales requiridos" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:311 msgid "Backwards" msgstr "Atrás" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:627 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:629 msgid "resources per day must be not empty and bigger than zero" msgstr "os recursos por día deben ser non baleiros e maiores que cero" -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:67 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:77 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:68 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:78 msgid "Version" msgstr "Versión" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:50 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51 msgid "Apply filtering to resources satisfying required criteria" msgstr "Aplicar filtrado aos recursos que satisfán os criterios requeridos" -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:103 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:104 msgid "Up" msgstr "Arriba" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:183 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:184 msgid "" "CriterionType is not valid, it overlaps other criterionSatisfaction with the " "same criterionType" @@ -641,7 +653,7 @@ msgstr "" msgid "Types of work hours" msgstr "Tipos de horas de traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:126 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:127 msgid "EAC" msgstr "EAC" @@ -653,7 +665,7 @@ msgstr "" "A súa planificación non está no escenario actual.\n" "Debe cambiar a un dos seguintes:\n" -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:36 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:37 msgid "Predecessor" msgstr "Predecesor" @@ -661,29 +673,29 @@ msgstr "Predecesor" msgid "Please select a task" msgstr "Por favor, seleccione unha tarefa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:135 +#: navalplanner-webapp/src/main/java/org/navalplanner/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" -#: navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul:22 +#: navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul:23 msgid "NavalPlan: Cost Categories" msgstr "NavalPlan: Categorías de custo" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:59 -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:57 -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:74 -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:62 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:58 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:75 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:60 msgid "End date" msgstr "Data de fin" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:254 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:255 msgid "missing worker code in the work report" msgstr "falta código de traballador nun parte de traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:140 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:142 msgid "" "Value is not valid, the default max value must be greater than the precision " "value " @@ -691,7 +703,7 @@ msgstr "" "O valor non é válido, o valor máximo por defecto debe ser maior có valor de " "precisión " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:145 +#: navalplanner-webapp/src/main/java/org/navalplanner/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." @@ -699,7 +711,7 @@ msgstr "" "Non pode eliminar a empresa \"{0}\" porque está sendo utilizada nalgún " "proxecto ou nalgunha tarefa subcontrada." -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:87 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:88 msgid "profile name is already being used by another profile" msgstr "o nome do perfil xa está a ser usado por outro perfil" @@ -711,189 +723,187 @@ msgstr "Correo electrónico" msgid "Prefix:" msgstr "Prefixo:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:106 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:109 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:111 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:107 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:110 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:112 msgid "This project has already been added." msgstr "Este proxecto xa fora engadido." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:275 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:579 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:35 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:47 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:43 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:580 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:320 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 msgid "Criteria" msgstr "Criterios" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:363 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:381 msgid "The task code cannot be null" msgstr "O código da tarefa non pode ser nulo" +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:138 +msgid "Resource / Criteria" +msgstr "Recurso / Criterios" + #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:26 msgid "User data" msgstr "Datos do usuario" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 -msgid "Resource / Criteria" -msgstr "Recurso / Criterios" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:84 -msgid "AS_SOON_AS_POSSIBLE" -msgstr "TAN_PRONTO_COMO_SEXA_POSIBLE" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:96 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:97 msgid "Error setting up creation form." msgstr "Erro preparando o formulario de creación." -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:86 +msgid "AS_SOON_AS_POSSIBLE" +msgstr "TAN_PRONTO_COMO_SEXA_POSIBLE" + +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:29 msgid "Add new progress assignment" msgstr "Engadir nova asignación de progreso" -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:43 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:44 msgid "Lines" msgstr "Liñas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:192 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:193 msgid "Error on showing warning message removing workReportType: " msgstr "" "Erro ao mostrar mensaxe de advertencia borrando tipo de parte de traballo: " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:625 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:624 msgid "Edit Work Report" msgstr "Editar parte de traballo" -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:21 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:22 msgid "Quality Forms List" msgstr "Lista de formularios de calidade" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:169 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:170 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" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:30 msgid "Personal data" msgstr "Datos persoais" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:298 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:161 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:199 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:157 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:198 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:299 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:162 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:158 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:199 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:200 msgid "please, select a Criterion" msgstr "por favor, seleccione un criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:731 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:732 msgid "Calculated progress can not be removed" msgstr "O progreso calculado non se pode borrar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java:126 -msgid "Project does not exist" -msgstr "O proxecto non existe" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:76 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:66 msgid "June" msgstr "Xuño" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java:92 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java:127 +msgid "Project does not exist" +msgstr "O proxecto non existe" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/EntryPointsHandler.java:143 msgid "{0} annotation required on {1}" msgstr "{0} anotación obrigatoria en {1}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:1030 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:1031 msgid "Modified" msgstr "Modificado" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:215 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:216 msgid "Add Criterion" msgstr "Engadir criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:642 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:126 +msgid "You can not remove the current scenario" +msgstr "Non se pode borrar o escenario actual" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:643 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." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:125 -msgid "You can not remove the current scenario" -msgstr "Non se pode borrar o escenario actual" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:88 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:329 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:334 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:89 msgid "MessagesContainer is needed" msgstr "É necesario un MessagesContainer" -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:37 msgid "Project element code" msgstr "Código da tarefa" -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:41 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28 -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:68 -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:43 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:69 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:42 msgid "Ending date" msgstr "Data de fin" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:75 -msgid "Show all progress" -msgstr "Mostrar todo o progreso" - -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:20 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:21 msgid "Templates List" msgstr "Lista de modelos" +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:29 +msgid "Export options" +msgstr "Opcións de exportación" + +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:34 +msgid "Subcontracted Tasks List" +msgstr "Lista de tarefas subcontratadas" + #: navalplanner-webapp/src/main/webapp/common/configuration.zul:229 msgid "Last value" msgstr "Último valor" -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:33 -msgid "Subcontracted Tasks List" -msgstr "Lista de tarefas subcontratadas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:704 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:705 msgid "Calculated progress can not be modified" msgstr "O progreso calculado non se pode modificar" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:68 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:69 msgid "Statistics log" msgstr "Histórico de estadísticas" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:46 -#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:39 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:47 +#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:40 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:51 msgid "Edit Calendar" msgstr "Editar calendario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:294 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:339 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:41 msgid "Materials Needs At Date" msgstr "Necesidades de materiais en data" +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:41 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:52 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:40 msgid "Cannot be empty or null" msgstr "Non pode ser baleiro ou nulo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:274 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:275 msgid "filtering" msgstr "filtrado" -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:33 msgid "Total Budget" msgstr "Presuposto total" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:52 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:53 msgid "Hierarchy" msgstr "Xerarquía" -#: navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:22 +#: navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:23 msgid "NavalPlan: Work Hours" msgstr "NavalPlan: Horas de traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:812 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:830 msgid "" "This worker cannot be deleted because it has assignments to projects or " "imputed hours" @@ -901,24 +911,24 @@ msgstr "" "Este traballador non se pode borrar porque ten asignacións a proxectos ou " "horas imputadas" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:25 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:26 msgid "Print configuration" msgstr "Imprimir configuración" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:26 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:27 msgid "Overload due to other assignments" msgstr "Sobrecarga debido a outras asignacións" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:148 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:149 msgid "Time period saved" msgstr "Período de tiempo gardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:304 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:167 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:205 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:163 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:204 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:305 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:168 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:164 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:205 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:206 msgid "This Criterion has already been added." msgstr "Este criterio xa fora engadido." @@ -930,76 +940,79 @@ msgstr "engadir" msgid "Unsaved changes will be lost. Would you like to continue?" msgstr "Perderánse os cambios sen gardar. Gustaríalle continuar?" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:40 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:34 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:35 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:41 msgid "Filter work report by :" msgstr "Filtrar parte de traballo por :" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeModel.java:84 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:290 +msgid "Workers" +msgstr "Traballadores" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/ResourceAllocationBehaviour.java:40 +msgid "NON_LIMITING" +msgstr "NON_LIMITANTE" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeModel.java:102 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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:245 -msgid "Workers" -msgstr "Traballadores" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:78 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:68 msgid "August" msgstr "Agosto" -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:57 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:53 msgid "Resources matching selected criteria" msgstr "Recursos que cumpren os criterios seleccionados" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:54 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:62 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:52 msgid "Year" msgstr "Ano" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:66 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:67 msgid "profile name not specified" msgstr "nome do perfil non especificado" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:61 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:62 msgid "Date Start" msgstr "Data de inicio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1280 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1281 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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:54 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:55 msgid "From Chosen" msgstr "A partir de elixidos" +#: navalplanner-webapp/src/main/webapp/planner/order.zul:109 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67 +msgid "Value" +msgstr "Valor" + #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:64 msgid "Hour costs" msgstr "Custos por hora" -#: navalplanner-webapp/src/main/webapp/planner/order.zul:108 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:66 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:55 -msgid "Value" -msgstr "Valor" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:558 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:713 msgid "there are no valid periods for this calendar" msgstr "non hai períodos válidos para este calendario" -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:40 -msgid "Edit Scenario" -msgstr "Editar escenario" - #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:76 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:52 msgid "Add role" msgstr "Engadir rol" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:568 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1039 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:41 +msgid "Edit Scenario" +msgstr "Editar escenario" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:643 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1113 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" @@ -1008,11 +1021,11 @@ msgstr "" msgid "Project from client" msgstr "Proxecto do cliente" -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:21 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:22 msgid "Progress Types List" msgstr "Lista de tipos de progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:414 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:415 msgid "" "The {0} can not be assigned to this resource. Its interval overlaps with " "other criterion" @@ -1024,11 +1037,11 @@ msgstr "" msgid "Work done until ending date:" msgstr "Traballo realizado ata a data de fin:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:131 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:132 msgid "Schedule Performance Index" msgstr "Índice de rendemento da planificación" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:138 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:139 msgid "Earlier starting date" msgstr "Data de inicio máis cedo" @@ -1036,31 +1049,31 @@ msgstr "Data de inicio máis cedo" msgid "Type data" msgstr "Datos do tipo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:268 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:313 msgid "Profiles" msgstr "Perfís" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:801 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:800 msgid "Hour finish" msgstr "Hora de fin" -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:39 -msgid "Edit Work Report Type" -msgstr "Editar tipo de parte de traballo" - #: navalplanner-webapp/src/main/webapp/common/configuration.zul:173 msgid "Perspectives" msgstr "Perspectivas" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:78 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:40 +msgid "Edit Work Report Type" +msgstr "Editar tipo de parte de traballo" + +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:104 msgid "Workable time" msgstr "Tempo traballable" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:239 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:240 msgid "missing code in a subcategory" msgstr "falta código nunha subcategoría" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:475 +#: navalplanner-webapp/src/main/java/org/navalplanner/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?" @@ -1080,25 +1093,21 @@ msgstr "Nome da empresa" msgid "Limiting resource allocation" msgstr "Asignación de recursos limitantes" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:948 -msgid "{0}" -msgstr "{0}" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:462 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:463 msgid "Split new assignment" msgstr "Dividir nova asignación" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:187 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:231 -msgid "Expiry date" -msgstr "Data de vencemento" - -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:67 -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:52 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:53 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:68 msgid "Pagination" msgstr "Paxinación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:336 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:265 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:286 +msgid "Expiry date" +msgstr "Data de vencemento" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:337 msgid "" "The operation does not perform because the task has progress reports that is " "spread associated with this quality form" @@ -1106,67 +1115,71 @@ msgstr "" "A operación non se pode levar a cabo porque a tarefa ten marcado como " "progreso progagado o asociado co formulario de calidade" -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:74 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:82 msgid "Change scenario" msgstr "Cambiar escenario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:343 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:344 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?" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloModel.java:83 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:68 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloModel.java:84 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:69 msgid "Critical path" msgstr "Camiño crítico" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:41 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:71 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:38 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:42 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:83 msgid "Categories" msgstr "Categorías" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:45 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:180 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:39 +#: navalplanner-webapp/src/main/webapp/common/error.zul:44 +msgid "Status code:" +msgstr "Código de estado:" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:46 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:181 msgid "Project Details" msgstr "Detalles do proxecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:93 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:94 msgid "Create Criterion Type" msgstr "Crear tipo de criterio" -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:225 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:117 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:202 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:225 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163 -#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:47 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185 msgid " to go to output directly" msgstr " ir á saída directamente" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:167 msgid "Add new hours group" msgstr "Engadir novo grupo de horas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:218 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:219 msgid "Criteria: {0} " msgstr "Criterios: {0} " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:384 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:109 -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:62 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:44 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:84 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:385 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:110 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:63 msgid "Percentage" msgstr "Porcentaxe" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:136 msgid "Updated" msgstr "Actualizado" @@ -1174,7 +1187,7 @@ msgstr "Actualizado" msgid "Company logo URL" msgstr "URL do logo da empresa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:130 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:131 msgid "No worker selected" msgstr "Ningún traballador seleccionado" @@ -1182,29 +1195,29 @@ msgstr "Ningún traballador seleccionado" msgid "Number of digits" msgstr "Número de díxitos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1628 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1651 msgid "Task not found" msgstr "Tarefa non atopada" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:38 -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:38 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:39 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:39 msgid "Total capability" msgstr "Capacidade total" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:663 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:684 msgid "It not could remove the task " msgstr "Non se puido borrar a tarefa " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:232 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:217 msgid "Problems connecting with client web service" msgstr "Problemas conectando co servizo web cliente" -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:20 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:21 msgid "NavalPlan: User access" msgstr "NavalPlan: Acceso de usuarios" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:120 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:142 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:154 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:183 msgid "Exception Type" msgstr "Tipo de excepción" @@ -1212,40 +1225,44 @@ msgstr "Tipo de excepción" msgid "NavalPlan: Materials" msgstr "NavalPlan: Materiais" -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:21 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:22 msgid "Profiles List" msgstr "Listado de perfís" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:277 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:278 msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "{0} da categoría {1} e {2} da categoría {3} teñen o mesmo código" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:236 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:853 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:240 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:277 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:875 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:566 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:67 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:63 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:50 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:567 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:896 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:322 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:64 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:68 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:51 msgid "Labels" msgstr "Etiquetas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:273 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:139 +msgid "is not supported for its use with NavalPlan." +msgstr "no está soportado para o seu uso con NavalPlan." + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:318 msgid "Data Types" msgstr "Tipos de datos" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:154 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:67 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:155 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68 msgid "Total hours" msgstr "Total de horas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:339 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:343 msgid "Reassigning {0} projects" msgstr "Reasignando {0} proxectos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:83 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:84 msgid "Create Work Hours Type" msgstr "Crear novo tipo de horas de traballo" @@ -1253,17 +1270,17 @@ msgstr "Crear novo tipo de horas de traballo" msgid "Filter by task status" msgstr "Filtrar por estado da tarefa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:471 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:422 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:423 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:533 msgid "Select date:" msgstr "Seleccione data:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:561 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1032 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:636 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1106 msgid "You should select a end date for the exception" msgstr "Debe seleccionar unha data de fin para a excepción" -#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:33 +#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:34 msgid "Please try it again." msgstr "Por favor, volva a intentalo." @@ -1271,133 +1288,129 @@ msgstr "Por favor, volva a intentalo." msgid "Company code" msgstr "Código da empresa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:109 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:110 msgid "Unknown attribute '{0}' in class {1}" msgstr "Atributo descoñecido '{0}' na clase {1}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:704 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:714 msgid "NON LIMITING RESOURCE" msgstr "RECURSO NON LIMITANTE" -#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:22 msgid "NavalPlan: Workers" msgstr "NavalPlan: Traballadores" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:123 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:125 msgid "as late as possible" msgstr "tan tarde como sexa posible" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:88 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:117 msgid "Activation periods" msgstr "Períodos de activación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:388 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:389 msgid "Passed" msgstr "Pasado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:87 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:127 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:174 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:88 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:175 msgid "already assigned" msgstr "xa asignado" -#: navalplanner-webapp/src/main/webapp/planner/order.zul:154 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:33 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:30 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:119 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:130 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:155 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:68 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:131 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:119 msgid "Calendar" msgstr "Calendario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:92 -msgid "{0}h" -msgstr "{0}h" - -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:30 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:55 -msgid "Read" -msgstr "Leer" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:255 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:300 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:99 msgid "Resources" msgstr "Recursos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:152 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:56 +msgid "Read" +msgstr "Leer" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:153 msgid "Source and destination scenarios should be different" msgstr "Os escenarios de orixe e destino deben ser diferentes" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:229 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:230 msgid "CriterionType and its criteria saved" msgstr "Tipo de criterio e os seus criterios gardados" -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:70 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:137 +msgid "The browser you are using" +msgstr "O navegador que está usando" + +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:78 msgid "scenario" msgstr "escenario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:94 -msgid " {0}m" -msgstr " {0}m" - -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:40 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:28 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:29 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:50 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:49 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:209 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:41 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:248 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:29 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:50 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:51 msgid "to" msgstr "a" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:178 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:197 msgid "Error on removing typeOfWorkHours: " msgstr "Erro borrando tipo de horas de traballo : " -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:111 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:112 msgid "worker's first name not specified" msgstr "nome do traballador non especificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:275 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:276 msgid "date not specified" msgstr "data non especificada" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:94 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:95 msgid "Select type :" msgstr "Seleccione tipo :" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:258 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:268 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:238 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:259 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:269 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:263 msgid "Projects Planning" msgstr "Planificación de proxectos" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:73 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:37 msgid "Shrink to fit page width" msgstr "Reducir para axustar ao ancho de páxina" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:66 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:67 msgid "Last name" msgstr "Apelidos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:549 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:322 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:348 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:551 msgid "Remove" msgstr "Borrar" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:253 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:254 msgid "cost category name not specified" msgstr "nome da categoría de custo non especificado" -#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:22 msgid "NavalPlan: Virtual Workers Groups" msgstr "NavalPlan: Grupos de traballadores virtuais" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:131 msgid "SPI" msgstr "SPI" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:217 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:244 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:245 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:218 msgid "" "Start date is not valid, the new start date must be previous the current " "start date" @@ -1405,15 +1418,15 @@ msgstr "" "A data de inicio non é válida, a data de inicio nova debe ser anterior data " "de inicio actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:389 +#: navalplanner-webapp/src/main/java/org/navalplanner/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" -#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:33 +#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:34 msgid "Create New Project" msgstr "Crear proxecto novo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1337 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1357 msgid "Stretches list" msgstr "Lista de tramos" @@ -1421,41 +1434,41 @@ msgstr "Lista de tramos" msgid "Enable scenarios module" msgstr "Habilitar módulo de escenarios" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:59 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:60 msgid "Zoom" msgstr "Zoom" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:520 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:135 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:80 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:104 -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:37 -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:40 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:129 -#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:39 -#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:40 -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:94 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:88 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:519 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:106 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:92 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:241 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:210 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:36 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:40 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:169 -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:37 -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:88 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:95 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:117 -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:38 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:129 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:76 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:45 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:50 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:39 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:130 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:46 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:52 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:130 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:38 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:42 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:54 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:185 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:37 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:41 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:211 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:38 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:41 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:135 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:80 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:241 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:80 msgid "Save" msgstr "Gardar" @@ -1463,51 +1476,56 @@ msgstr "Gardar" msgid "Material categories" msgstr "Categorías de materiais" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:131 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:61 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:33 +msgid "Standard Effort" +msgstr "Esforzo estándar" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:133 msgid "Pending update" msgstr "Actualización pendente" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:67 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:59 msgid "End date:" msgstr "Data de fin:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:159 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:160 msgid "Criterion previously selected" msgstr "Criterio seleccionado previamente" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:50 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:51 msgid "Users authorization" msgstr "Autorización de usuarios" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:172 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:177 msgid "Problems connecting with subcontractor web service" msgstr "Problemas conectando co servizo web subcontratista" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:43 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:44 msgid "Assigned load" msgstr "Carga asignada" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:76 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:68 msgid "Filter by workers" msgstr "Filtrar por traballadores" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:116 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:139 msgid "End Date" msgstr "Data de fin" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:368 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:374 msgid "Some allocations needed" msgstr "Precísanse algunas asignacións" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:129 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82 msgid "Resources Per Day" msgstr "Recursos por día" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:215 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:216 msgid "ResourceType must be not-null" msgstr "ResourceType non debe ser nulo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:94 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:95 msgid "" "Estimated end date for the task (press enter in textbox to open calendar " "popup or type in date directly)" @@ -1515,94 +1533,93 @@ msgstr "" "Data de fin estimada para a tarefa (presione enter no cadro de texto para " "abrir o calendario ou escriba a data directamente)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:280 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:281 msgid "Expand/Collapse all" msgstr "Expandir/Pregar todo" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:31 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:32 msgid "Overload due to current project" msgstr "Sobrecarga debido ao proxecto actual" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:867 +msgid "Move down" +msgstr "Mover abaixo" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:116 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:112 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:137 +msgid "Please, select a project" +msgstr "Por favor, seleccione un proxecto" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:841 msgid "Name: {0}" msgstr "Nome: {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:866 -msgid "Move down" -msgstr "Mover abaixo" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:115 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:111 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:136 -msgid "Please, select a project" -msgstr "Por favor, seleccione un proxecto" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:79 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:69 msgid "September" msgstr "Setembro" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:26 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:27 msgid "Report structure" msgstr "Estrutura do parte" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:87 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:88 msgid "password not specified" msgstr "contrasinal non especificado" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:58 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:41 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:117 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:59 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:42 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:118 msgid "General data" msgstr "Datos xerais" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:126 msgid "BAC" msgstr "BAC" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:428 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:399 msgid "Calculate Number of Hours" msgstr "Calcular número de horas" -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:37 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:80 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81 msgid "Assign" msgstr "Asignar" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java:129 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java:130 msgid "missing code in a criterion" msgstr "falta código nun criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1278 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1297 msgid "Create Template" msgstr "Crear modelo" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:22 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:22 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:22 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:23 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:23 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:23 msgid "NavalPlan: Work Reports" msgstr "NavalPlan: Partes de traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:114 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:115 msgid "Edit Company" msgstr "Editar empresa" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:78 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:114 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:67 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:60 msgid "Advanced search" msgstr "Búsqueda avanzada" +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:86 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:78 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:99 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:116 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:78 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:107 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:78 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:86 msgid "Filter by labels" msgstr "Filtrar por etiquetas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:669 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:672 msgid "" "IMPORTANT: Don't forget to communicate to subcontractor that his contract " "has been cancelled" @@ -1610,7 +1627,7 @@ msgstr "" "IMPORTANTE: Non olvide comunicar ao subcontratista que o seu contrato foi " "cancelado" -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:37 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:38 msgid "MonteCarlo chart" msgstr "Diagrama de Montecarlo" @@ -1618,267 +1635,277 @@ msgstr "Diagrama de Montecarlo" msgid "NavalPlan: Hours Worked Per Resource" msgstr "NavalPlan: Horas traballadas por recurso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:126 msgid "Schedule Variance" msgstr "Desviación en planificación" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:409 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:410 msgid "Service does not manage resource of type: {0}" msgstr "O servizo non xestiona recursos de tipo: {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:601 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:639 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:670 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1290 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:190 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:185 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:442 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1302 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:604 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:642 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:673 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:191 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:210 msgid "Warning" msgstr "Advertencia" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:34 -#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:30 msgid "Select parent calendar" msgstr "Seleccionar o calendario pai" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:95 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:167 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:462 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:525 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:96 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:168 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:463 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:526 msgid "There is no task with this code" msgstr "Non hai ningunha tarefa con este código" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:292 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:214 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:433 +msgid "The type of hours cannot be null" +msgstr "O tipo de horas no pode ser nulo" + +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:297 msgid "criterion satisfaction with end date less than start date" msgstr "o criterio satisfeito ten data de fin anterior á de inicio" -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:230 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:189 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:214 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:197 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:122 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:170 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:112 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:206 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:230 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:167 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:48 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:189 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49 msgid "Show" msgstr "Mostrar" -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:75 -msgid "Assignment Type" -msgstr "Tipo de asignación" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:57 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:58 msgid "Duration (days)" msgstr "Duración (días)" -#: navalplanner-webapp/src/main/webapp/planner/index.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:22 -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/resources_use.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:21 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:21 -#: navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:71 +msgid "Assignment Type" +msgstr "Tipo de asignación" + +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/index.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/resources_use.zul:22 +#: navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul:22 msgid "NavalPlan: Scheduling" msgstr "NavalPlan: planificación" -#: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:28 +#: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:29 msgid "Back to log in" msgstr "Volver a iniciar sesión" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:480 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:482 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:481 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:483 msgid "Error on splitting" msgstr "Erro ao dividir" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:76 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:31 msgid "Planned start :" msgstr "Inicio planificado :" -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46 -msgid "Company" -msgstr "Empresa" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:65 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:66 msgid "Node without children" msgstr "Nodo sen fillos" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:117 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47 +msgid "Company" +msgstr "Empresa" + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:118 msgid "There is no label with this code " msgstr "Non hai ningunha etiqueta con este código" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:209 -msgid "Task: {0} " -msgstr "Tarefa: {0} " - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:136 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:138 msgid "Profile saved" msgstr "Perfil gardado" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:210 +msgid "Task: {0} " +msgstr "Tarefa: {0} " + #: navalplanner-webapp/src/main/webapp/planner/editTask.zul:65 msgid "Task properties" msgstr "Propiedades da tarefa" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:74 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:75 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" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:55 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:56 msgid "Sum of direct imputed hours" msgstr "Suma de horas imputadas directamente" -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:34 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:35 msgid "Surname" msgstr "Apelidos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1289 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1301 msgid "You need to select some function to configure" msgstr "Necesita seleccionar algunha función para configurar" -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:21 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:22 msgid "Exception Day Types List" msgstr "Lista de tipos de día de excepción" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:374 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:375 msgid "the name must be not null or not empty" msgstr "o nome non pode ser nulo ou baleiro" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:392 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:742 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:48 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:110 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:393 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:741 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:31 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:76 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:156 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:66 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:67 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:115 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:111 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:77 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:68 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:131 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:67 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:157 msgid "Date" msgstr "Data" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:40 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:363 +msgid "there must be {0} effort instead of {1}" +msgstr "debe haber {0} esforzo en lugar de {1}" + +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:41 msgid "Add From Template" msgstr "Engadir a partir de modelo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:600 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:638 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:603 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:641 msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "Os recursos asignados para esta tarefa serán borrados. Está seguro?" -#: navalplanner-webapp/src/main/webapp/excetiondays/exceptionDays.zul:21 +#: navalplanner-webapp/src/main/webapp/excetiondays/exceptionDays.zul:22 msgid "NavalPlan: Exception Days" msgstr "NavalPlan: Días de excepción" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:640 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:641 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." -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:55 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:45 msgid "Filter by month" msgstr "Filtrar por mes" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:525 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:361 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:351 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:320 +msgid "The criterion and its type cannot be null" +msgstr "O criterio e o seu tipo non poden ser nulos" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:526 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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:350 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:360 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:319 -msgid "The criterion and its type cannot be null" -msgstr "O criterio e o seu tipo non poden ser nulos" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:212 -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" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:77 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:67 msgid "July" msgstr "Xullo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:517 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:220 +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" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:543 msgid "( max: {0} )" msgstr "( máx: {0} )" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:208 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:218 msgid "Error on removing element: " msgstr "Erro ao borrar elemento: " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:41 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:71 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:61 msgid "January" msgstr "Xaneiro" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:63 -msgid "Cannot calculate charts for current data" -msgstr "Non se poden calcular gráficos para os datos actuais" - -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:53 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:54 msgid "Select queue" msgstr "Seleccionar cola" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:513 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:64 +msgid "Cannot calculate charts for current data" +msgstr "Non se poden calcular gráficos para os datos actuais" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:582 msgid "The cost category had already been removed." msgstr "A categoría de custo xa fora borrada." -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:47 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:48 msgid "Work description" msgstr "Descrición do traballo" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:64 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:59 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:63 msgid "Split assignment" msgstr "Dividir asignación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:117 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:118 msgid "You can not remove the default scenario called \"{0}\"" msgstr "Non se pode borrar o escenario por defecto, chamado \"{0}\"" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:546 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:572 msgid "There are not any assigned progress to current task" msgstr "Non hai ningún progreso asignado á tarefa actual" -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:109 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:110 msgid "Down" msgstr "Abaixo" -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:224 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:184 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:209 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:192 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:116 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:165 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:106 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:201 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:224 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:162 -#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:46 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:184 msgid "direct link" msgstr "enlace directo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:35 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:29 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:933 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:934 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:36 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:48 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:89 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:47 msgid "Label" msgstr "Etiqueta" -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:36 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:37 msgid "Create Scenario" msgstr "Crear Escenario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:833 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:834 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" @@ -1887,73 +1914,76 @@ msgstr "O valor non é válido, tendo en conta a lista actual de HoursGroup" msgid "Association with roles" msgstr "Asociación con roles" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:383 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:384 msgid "missing type of work hours in a work report line" msgstr "falta tipo de horas de traballo nunha liña do parte" -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:29 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:30 msgid "Quality forms" msgstr "Formularios de calidade" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:143 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:144 msgid "Hours group" msgstr "Grupo de horas" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:95 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:29 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:30 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:96 msgid "Days from Beginning to Deadline" msgstr "Días desde o comezo ata a data límite" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:127 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:128 msgid "Estimate At Completion" msgstr "Estimación de custo total actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:322 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:175 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:199 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:372 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:421 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:194 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:373 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:200 msgid "Delete item. Are you sure?" msgstr "Borrar elemento. ¿Está seguro?" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:101 +#: navalplanner-business/src/main/java/org/navalplanner/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" +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:178 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:92 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:167 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:189 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:208 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:170 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:197 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:167 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:178 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:102 -#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:35 msgid "Output format:" msgstr "Formato de saída:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:44 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:956 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1030 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:45 msgid "Direct" msgstr "Directo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:819 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:51 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:818 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:189 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:268 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:289 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:52 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:83 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:34 msgid "Op." msgstr "Op." -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:43 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:44 msgid "Pessimistic" msgstr "Pesimista" -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:55 #: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:55 msgid "Reference date:" msgstr "Data de referencia:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:468 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:471 msgid "Limiting resource assignation" msgstr "Asignación de recursos limitantes" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1234 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1235 msgid "" "This progress can not be removed, because it is spread. It is necessary to " "select another progress as spread." @@ -1961,20 +1991,20 @@ msgstr "" "Este progreso non se pode eliminar porque é propagado. Cómpre seleccionar " "outro progreso como propagado" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:87 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:116 msgid "Work week" msgstr "Semana de traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:127 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:128 msgid "You will lose the changes. Are you sure?" msgstr "Perderanse os cambios. ¿Está seguro?" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:28 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:45 msgid "Company ID" msgstr "NIF" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:184 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:192 msgid "Unit type name cannot be empty" msgstr "O nome do tipo de unidade non pode ser baleiro" @@ -1982,149 +2012,147 @@ msgstr "O nome do tipo de unidade non pode ser baleiro" msgid "Entity sequences" msgstr "Secuencias de entidade" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:90 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:91 msgid "Delay from beginning (days)" msgstr "Retraso desde o comezo (en días)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:303 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:319 msgid "Resource cannot be null" msgstr "O recurso non pode ser nulo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:533 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:505 msgid "Total Hours" msgstr "Horas totais" -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:36 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:37 msgid "Create Progress Type" msgstr "Crear novo tipo de progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:129 msgid "Confirm cancel" msgstr "Confirmar cancelación" -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:61 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:62 msgid "Label list" msgstr "Lista de etiquetas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:290 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:335 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 msgid "Work And Progress Per Task" msgstr "Traballo e progreso por tarefa" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:39 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:40 msgid "WBS (tasks)" msgstr "EDT (tarefas)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:90 -msgid "start not earlier than" -msgstr "empezar non antes de" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:187 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:469 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:483 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:149 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:858 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:206 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:261 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1227 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:298 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:132 -msgid "Error on showing removing element: " -msgstr "Erro ao mostrar o elemento a borrar: " - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:689 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:690 msgid "Deleting sequence" msgstr "Borrando secuencia" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:133 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:538 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:552 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:150 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:299 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:423 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:860 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:895 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:207 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:262 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1250 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:227 +msgid "Error on showing removing element: " +msgstr "Erro ao mostrar o elemento a borrar: " + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:92 +msgid "start not earlier than" +msgstr "empezar non antes de" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:130 msgid "AS_LATE_AS_POSSIBLE" msgstr "TAN_TARDE_COMO_SEXA_POSIBLE" -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:79 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:87 msgid "Select scenario" msgstr "Seleccionar escenario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:135 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:218 msgid "Create Label Type" msgstr "Crear tipo de etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:232 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:233 msgid "missing work report code in a work report" msgstr "falta o código nun parte de traballo" -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:35 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:36 msgid "Create Work Report Type" msgstr "Crear tipo de parte de traballo" -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51 msgid "Criterion requirement" msgstr "Criterios requiridos" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:34 -msgid "PDF" -msgstr "PDF" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1170 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1246 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." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:328 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:148 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:153 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:329 msgid "Scheduling saved" msgstr "Planificación gardada" -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:26 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:68 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:196 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:155 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:27 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:171 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:197 msgid "Add new row" msgstr "Engadir nova fila" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:781 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:783 msgid "incorrect initialization of the progress assignment controller." msgstr "inicialización incorrecta do controlador de asignación de progreso." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:487 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:488 msgid "Move" msgstr "Mover" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:224 msgid "missing code in the resource calendar" msgstr "falta código no calendario de recursos" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:33 -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:28 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:29 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:34 msgid "Overload" msgstr "Sobrecarga" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:67 -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:29 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:30 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:68 msgid "Assignment log" msgstr "Histórico de asignacións" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyCaptTimeout.java:44 -msgid "CutycaptTimeout thread exception" -msgstr "Excepción no thread CutycaptTimeout" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:280 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:21 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:325 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:22 msgid "Work Report Models" msgstr "Modelos de partes de traballo" -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyCaptTimeout.java:45 +msgid "CutycaptTimeout thread exception" +msgstr "Excepción no thread CutycaptTimeout" + +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:48 msgid "Date last progress measurement" msgstr "Data da última medida de progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:102 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:103 msgid "Deadline (days since beggining project)" msgstr "Data límite (días desde o inicio do proxecto)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:404 +#: navalplanner-webapp/src/main/java/org/navalplanner/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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:359 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:385 msgid "" "Calendar cannot be removed because it still has children. Some other " "calendar is derived from this one." @@ -2132,107 +2160,106 @@ msgstr "" "O calendario non se pudo borrar porque aínda ten fillos. Algún outro " "calendario deriva deste." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:917 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:918 msgid "Value is not valid, the type must be not empty" msgstr "O valor non é válido, o tipo non pode estar baleiro" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:443 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:444 msgid "criterion type name is already being used" msgstr "o nome de tipo de criterio está sendo usado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:310 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:326 msgid "Task code cannot be null" msgstr "O código da tarefa non pode ser nulo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:544 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:570 msgid "It is not allowed to consolidate progress." msgstr "Non se pode borrar progreso consolidado." -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:31 msgid "Create Task" msgstr "Crear tarefa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:97 +#: navalplanner-webapp/src/main/java/org/navalplanner/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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:139 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:151 msgid "Edit Cost Category" msgstr "Editar categoría de custo" -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:82 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:112 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:26 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:58 -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:27 -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:43 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:65 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:31 -msgid "Actions" -msgstr "Accións" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:26 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27 msgid "External company" msgstr "Empresa externa" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:86 -msgid "Exceptions" -msgstr "Excepcións" +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:66 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:29 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:27 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:82 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:112 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:58 +msgid "Actions" +msgstr "Accións" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:71 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:80 msgid "Start hour" msgstr "Hora de inicio" -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:60 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:115 +msgid "Exceptions" +msgstr "Excepcións" + +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32 msgid "Over assignable" msgstr "Sobreasignable" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:225 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:139 +msgid "Assign materials" +msgstr "Asignar materiais" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:226 msgid "format filters are not valid" msgstr "o formato dos filtros non é válido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:50 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:71 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:36 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:37 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:72 msgid "ID" msgstr "NIF" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:350 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:180 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:419 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:181 msgid "The init date cannot be empty" msgstr "A data de inicio non pode ser baleira" +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:28 +msgid "Is administrator" +msgstr "É administrador" + #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:88 msgid "Our company password" msgstr "Contrasinal da nosa empresa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:274 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:133 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:171 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:129 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:170 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:275 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:130 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:171 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:172 msgid "This label has already been added." msgstr "Esta etiqueta xa fora engadida." -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:177 -msgid "Inh." -msgstr "Her." - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/IntegrationEntityModel.java:78 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceServiceREST.java:178 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/IntegrationEntityModel.java:79 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceServiceREST.java:179 msgid "Could not get code, please try again later" msgstr "Non se puido obter o código, por favor volva intentalo máis tarde" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:46 -msgid "A2" -msgstr "A2" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:393 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:394 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_'." @@ -2240,55 +2267,59 @@ msgstr "" "O valor non é válido.\n" " o código no pode conter caracteres como '_'." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:619 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:625 msgid "Confirm deleting this machine. Are you sure?" msgstr "Confirmar o borrado desta máquina. ¿Está seguro?" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:160 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:161 msgid "Hours Group" msgstr "Grupo de horas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:914 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:915 msgid "Unallocated name" msgstr "Nome no asignado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:887 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:888 msgid "Move up" msgstr "Mover arriba" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:123 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 msgid "BCWP" msgstr "BCWP" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:42 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:43 msgid "Subcontract communication date" msgstr "Data de comunicación da subcontratación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:125 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:128 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:280 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:237 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:309 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:281 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:129 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:132 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:262 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:354 msgid "Scheduling" msgstr "Planificación" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:125 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:126 msgid "Dependencies have priority" msgstr "As dependencias teñen prioridade" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:126 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:206 +msgid "Unlimited" +msgstr "Ilimitado" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:127 msgid "Budget At Completion" msgstr "Total custo planificado" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:76 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:77 msgid "Assign Label" msgstr "Asignar etiqueta" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:73 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:74 msgid "Page up" msgstr "Páxina arriba" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:230 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:231 msgid "Create new project" msgstr "Crear novo proxecto" @@ -2297,138 +2328,141 @@ msgid "Work done from starting date:" msgstr "Traballo realizado desde a data de inicio:" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:849 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:44 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:158 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:34 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:49 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:159 msgid "State" msgstr "Estado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:79 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:80 msgid "Must start after" msgstr "Debe empezar despois" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1275 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1287 msgid "Confirm change" msgstr "Confirmar cambio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:863 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:865 msgid "You don't have permissions to edit this project" msgstr "Non ten permisos para editar este proxecto" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:37 -msgid "Single image" -msgstr "Imaxe simple" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:102 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:104 msgid "Edit Profile" msgstr "Editar perfil" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:192 msgid "missing date in a calendar exception" msgstr "falta a data nunha excepción de calendario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:524 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:213 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:432 +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" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:599 msgid "Exception" msgstr "Excepción" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:107 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:179 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:449 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:514 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:108 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:180 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:450 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:515 msgid "There is no resource with this ID" msgstr "Non hai un recurso con este NIF" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:191 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:194 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:192 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:196 msgid "Send" msgstr "Enviar" -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:95 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:103 msgid "user" msgstr "usuario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java:72 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java:53 msgid "New task" msgstr "Nova tarefa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:115 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:125 msgid "The password for a new user cannot be empty" msgstr "O contrasinal non pode ser baleiro para un usuario novo" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:31 msgid "Associated user" msgstr "Usuario asociado" -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:27 msgid "Type name" msgstr "Nome do tipo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/advances/AdvanceAssignmentPlanningCommand.java:68 -msgid "Progress assignment" -msgstr "Asignacións de progreso" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:30 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:181 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:204 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:439 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:33 -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:26 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:182 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:205 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:31 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:440 msgid "All" msgstr "Todo" -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69 +msgid "Progress assignment" +msgstr "Asignacións de progreso" + +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:40 msgid "Edit Progress Type" msgstr "Editar tipo de progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:456 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:459 msgid "Manual" msgstr "Manual" -#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:21 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:22 msgid "Calendars List" msgstr "Lista de calendarios" -#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:21 -msgid "Resources List" -msgstr "Lista de recursos" - -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:27 msgid "Receipt date" msgstr "Data de recepción" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:209 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:210 msgid "Cannot be higher than Ending date" msgstr "Non pode ser posterior á data de fin" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:236 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:292 msgid "Create activation period" msgstr "Crear período de activación" -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:21 -msgid "Workers List" -msgstr "Lista de traballadores" - -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:31 msgid "Personal details" msgstr "Detalles persoais" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:354 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:22 +msgid "Workers List" +msgstr "Lista de traballadores" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:355 msgid "Delete project template. Are you sure?" msgstr "Borrar modelo de proxecto. ¿Está seguro?" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:47 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:954 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1028 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:48 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:214 msgid "Inherited" msgstr "Herdado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:216 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:217 msgid "Criterion must be not-null" msgstr "O criterio non debe ser nulo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:525 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:255 +msgid "Worker" +msgstr "Traballador" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:517 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:595 msgid "" "Cannot allocate selected element. There is not any queue that matches " "resource allocation criteria at any interval of time" @@ -2436,46 +2470,42 @@ 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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:254 -msgid "Worker" -msgstr "Traballador" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:160 -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:254 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:161 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:299 msgid "criterion name not specified" msgstr "nome do criterio non especificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:136 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 " -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:24 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:25 msgid "Manual allocation" msgstr "Asignación manual" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:28 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:29 msgid "External overload" msgstr "Sobrecarga externa" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:32 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:57 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:33 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:58 msgid "Authorize" msgstr "Autorizar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:258 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:47 +msgid "Recommended allocation" +msgstr "Asignación recomendada" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:303 msgid "Scenarios" msgstr "Escenarios" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:374 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:375 msgid "Materials saved" msgstr "Materiais gardados" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:55 -msgid "Quarter" -msgstr "Cuarto" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1248 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1249 msgid "" "This progress measurement can not be in current date, because it is " "consolidated. it is necessary to select other date." @@ -2483,115 +2513,115 @@ msgstr "" "Esta medida de progreso non pode estar na data actual, porque está " "consolidada. Débese seleccionar outra data." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:699 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:704 msgid "Other projects" msgstr "Outros proxectos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:163 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:164 msgid "At least one {0} sequence must be active" msgstr "Polo menos unha secuencia de {0} debe estar activa" +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:26 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:111 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:25 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:41 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:65 msgid "Profile name" msgstr "Nome do perfil" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:241 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:248 msgid "Could open generated PDF" msgstr "Non se puido abrir o PDF xerado" -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:106 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:107 msgid "Disable Delete" msgstr "Deshabilitar borrado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:143 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:144 msgid "You should select a source scenario" msgstr "Debe seleccionar un escenario de orixe" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:158 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:159 msgid "At least one {0} sequence is needed" msgstr "Necesítase polo menos unha secuencia de {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:291 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:336 #: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 msgid "Estimated/Planned Hours Per Task" msgstr "Horas estimadas/planificadas por tarefa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:67 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:68 msgid "Assigned" msgstr "Asignado" -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:45 msgid "Details" msgstr "Detalles" -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 msgid "Communication" msgstr "Comunicación" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:35 msgid "More options" msgstr "Máis opcións" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:184 -msgid "Company saved" -msgstr "Empresa gardada" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:234 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:174 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:219 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:179 msgid "Error: {0}" msgstr "Erro: {0}" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:185 +msgid "Company saved" +msgstr "Empresa gardada" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/TreeElementOperationsController.java:240 msgid "Confirm create template" msgstr "Confirmar a creación do modelo" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:185 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:261 msgid "Parent" msgstr "Pai" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:90 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:91 msgid "Earliest date" msgstr "Data máis cedo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:126 msgid "Type of work hours saved" msgstr "Tipo de horas de traballo gardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:112 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:239 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:45 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:113 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:269 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:46 msgid "Projects" msgstr "Proxectos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:149 -msgid "Create Quality Form" -msgstr "Crear formulario de calidade" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java:63 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java:64 msgid "Not found converter for {0}" msgstr "Non se atopou un conversor para {0}" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:69 -msgid "Material assignments" -msgstr "Asignacións de materiais" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:150 +msgid "Create Quality Form" +msgstr "Crear formulario de calidade" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:103 msgid "start in fixed date" msgstr "comezar en data fixa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:82 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:70 +msgid "Material assignments" +msgstr "Asignacións de materiais" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:45 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:72 msgid "December" msgstr "Decembro" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:921 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:922 msgid "Text field" msgstr "Campo de texto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:120 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:122 msgid "" "Value is not valid, the Precision value must be less than the defalt max " "value." @@ -2599,11 +2629,11 @@ msgstr "" "O valor non é válido, o valor de precisión debe ser menor que o valor máximo " "por defecto." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:180 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:181 msgid "Question" msgstr "Pregunta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1245 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1246 msgid "" "This progress measurement can not be changed or removed, because it is " "consolidated. It is needed to remove its consolidation." @@ -2611,19 +2641,23 @@ msgstr "" "Esta medida de progreso non pode ser cambiada ou borrada, porque está " "consolidada. Débese borrar a consolidación." -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:215 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:222 msgid "Create new work week" msgstr "Crear nova semana de traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:703 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:713 msgid "LIMITING RESOURCE" msgstr "RECURSO LIMITANTE" -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:42 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:43 msgid "Subcontratation" msgstr "Subcontratación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:534 +msgid "{0} cannot be fulfilled" +msgstr "Non se pode cumprir {0}" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:198 msgid "" "The meausure name is not valid. There is another unit type with the same " "measure name" @@ -2631,15 +2665,15 @@ msgstr "" "O nome da medida non é válido. Hai outro tipo de unidade co mesmo nome de " "medida" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:115 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:68 msgid "Extended view" msgstr "Vista expandida" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:33 msgid "Work record" msgstr "Rexistro de traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:115 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:116 msgid "Error setting up edition form." msgstr "Erro preparando o formulario de edición." @@ -2648,66 +2682,72 @@ msgstr "Erro preparando o formulario de edición." msgid "Output format" msgstr "Formato de saída" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:81 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:44 msgid "Print" msgstr "Imprimir" -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:21 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:22 msgid "NavalPlan: Calendars" msgstr "NavalPlan: Calendarios" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:178 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:179 msgid "{0} not found type for criterion " msgstr "{0} non atopado tipo para criterio " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:394 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:412 msgid "Hours cannot be null" msgstr "As horas non poden ser nulas" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:68 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:69 msgid "Page down" msgstr "Páxina abaixo" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:484 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:485 msgid "resource type does not allow enabled criteria" msgstr "o tipo de recurso non permite criterios habilitados" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:51 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:134 -#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:49 -#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:81 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:84 -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:82 -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:40 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:71 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:134 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:169 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:139 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:84 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:110 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:133 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:100 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:92 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:48 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:22 +#: navalplanner-webapp/src/main/webapp/common/error.zul:21 +msgid "NavalPlan: Runtime Error" +msgstr "NavalPlan: Erro de execución" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:52 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:112 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:77 -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:91 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:243 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:92 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:46 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:101 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:41 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:136 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:49 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:55 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:34 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:134 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:40 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:44 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:85 +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:81 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:41 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:72 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:135 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:170 +#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:50 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:45 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:81 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:216 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:38 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:42 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:175 -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:39 -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:43 -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:40 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:135 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:82 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 -#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:33 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:47 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:52 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:141 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:191 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:39 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:43 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:217 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:139 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:84 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:243 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:99 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:86 msgid "Cancel" msgstr "Cancelar" @@ -2715,151 +2755,151 @@ msgstr "Cancelar" msgid "General user data" msgstr "Datos xerais do usuario" -#: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:31 +#: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:32 msgid "Unschedule" msgstr "Quitar planificación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:201 msgid "Subcontracted task sent successfully" msgstr "A tarefa subcontratada enviouse con éxito" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:72 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:73 msgid "Accumulated hours chart" msgstr "Gráfico de horas acumuladas" -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:22 msgid "Machines List" msgstr "Lista de máquinas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:659 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:905 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:525 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:526 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:661 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:924 msgid "You don't have read access to this project" msgstr "Non ten acceso de lectura a este proxecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:129 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130 msgid "CPI" msgstr "CPI" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:179 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:180 msgid "" "Disable hierarchy will cause criteria tree to be flattened. Are you sure?" msgstr "" "Dehabilitar a xerarquía fará que se aplane a árbore de criterios. ¿Está " "seguro?" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 -#: navalplanner-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:37 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:29 -msgid "Units" -msgstr "Unidades" - +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:45 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:52 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:53 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:47 msgid "Dates" msgstr "Datas" -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:44 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:38 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:28 +msgid "Units" +msgstr "Unidades" + +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:45 msgid "Create Calendar" msgstr "Crear Calendario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:131 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:185 msgid "At least one stretch is needed" msgstr "Necesítase alo menos un tramo" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:302 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:307 msgid "a day is not valid" msgstr "un día non é válido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesCommand.java:60 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesCommand.java:61 msgid "Task Properties" msgstr "Propiedades da tarefa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:180 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:192 msgid "Cost category saved" msgstr "Categoría de custo gardada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:236 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:213 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:228 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:214 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:237 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:229 msgid "" "End date is not valid, the new end date must be greater than the start date" msgstr "" "Data de fin inválida, a data de fin nova debe ser posterior á data de inicio" -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:32 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:33 msgid "name" msgstr "nome" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:168 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:170 msgid "Progress type saved" msgstr "Tipo de progreso gardado" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:71 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:72 msgid "Delete selected task" msgstr "Borrar tarefa seleccionada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java:129 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java:130 msgid "{0} (max: {1})" msgstr "{0} (máx: {1})" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:458 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:459 msgid "end" msgstr "fin" -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:62 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:63 msgid "Log" msgstr "Diario" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:56 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:57 msgid "Authorizations" msgstr "Autorizacións" -#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:35 -#: navalplanner-webapp/src/main/webapp/common/event_error.zul:28 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:49 +#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:36 msgid "Continue" msgstr "Continuar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java:120 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java:121 msgid "Edit task {0}" msgstr "Editar tarefa: {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:209 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:235 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:236 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:210 msgid "Start date cannot be null" msgstr "A data de inicio non pode ser nula" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:252 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:297 msgid "Subcontracting" msgstr "Subcontratación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:325 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:328 msgid "references" msgstr "referencias" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1283 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1284 msgid "Value is not valid, the Precision value must be exact " msgstr "O valor non é válido, o valor de precisión debe ser exacto " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java:53 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java:55 msgid "Generic" msgstr "Xenérico" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:85 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:41 msgid "Planned workable days :" msgstr "Días laborais planificados :" -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:46 -msgid "Default max value" -msgstr "Valor máximo por defecto" - -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:36 msgid "Add criterion requirement" msgstr "Engadir criterio requirido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:878 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:47 +msgid "Default max value" +msgstr "Valor máximo por defecto" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:880 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 " @@ -2868,39 +2908,35 @@ msgstr "" "Non se pode borrar o proxecto \"{0}\" porque algunha das súas tarefas estase " "usando nalgún parte de traballo e o proxecto só existe no escenario actual" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:85 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:86 msgid "Percentage of estimated budget hours / hours consumed" msgstr "Porcentaxe de horas presupostadas / horas consumidas" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:498 +msgid "Automatic" +msgstr "Automático" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionBandboxFinder.java:44 msgid "Criterion Name" msgstr "Nome do criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:495 -msgid "Automatic" -msgstr "Automático" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:47 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:47 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:90 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:52 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:91 msgid "Task" msgstr "Tarefa" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:80 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:35 msgid "Planned end :" msgstr "Fin planificado :" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64 -msgid "2010" -msgstr "2010" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:269 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:127 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:166 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:123 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:164 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:84 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:270 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:124 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:165 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:167 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:85 msgid "please, select a label" msgstr "por favor, seleccione unha etiqueta" @@ -2908,54 +2944,53 @@ msgstr "por favor, seleccione unha etiqueta" msgid "Add profile" msgstr "Engadir perfil" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:214 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:215 msgid "filter already exists" msgstr "o filtro xa existe" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:225 msgid "missing code in a calendar data version" msgstr "falta código nos datos de versión dun calendario" -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:39 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:41 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:45 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:40 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:46 msgid "Criterion name" msgstr "Nome do criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:130 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:131 msgid "values are not valid, the values must not be null" msgstr "os valores non son válidos, non deben ser nulos" -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:31 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:49 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:32 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:78 msgid "Task name" msgstr "Nome da tarefa" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:127 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:128 msgid "cost assignment's resource not specified" msgstr "recurso da asignación de custo non especificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:46 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:124 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:135 -#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java:72 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:126 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:51 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136 msgid "Project" msgstr "Proxecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:78 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:79 msgid "Unassigned" msgstr "Non asignado" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:100 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:101 msgid "Add new criterion requirement" msgstr "Engadir novo criterio requirido" -#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:24 +#: navalplanner-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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:123 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 msgid "Budgeted Cost Work Performed" msgstr "Custo presupostado do traballo realizado" @@ -2963,21 +2998,35 @@ msgstr "Custo presupostado do traballo realizado" msgid "Work report" msgstr "Parte de traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:297 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:135 +msgid "Change the password" +msgstr "Cambiar o contrasinal" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:302 msgid "the name must be not empty" msgstr "o nome non pode ser baleiro" -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:58 -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:26 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:86 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:27 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:58 msgid "Disabled" msgstr "Deshabilitado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:598 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:349 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:350 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:736 msgid "Earned value" msgstr "Valor gañado" +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:216 +msgid "Inherited from parent calendar" +msgstr "Herdado do calendario pai" + +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:146 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:184 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:210 +msgid "Normal Effort" +msgstr "Esforzo normal" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/TreeElementOperationsController.java:250 msgid "" "Templates can only be created out of existent tasks.You are trying to create " @@ -2988,11 +3037,15 @@ msgstr "" "tentando crear un modelo a partir dunha tarefa nova.\n" "Por favor garde o seu proxecto antes de continuar." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:91 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:137 +msgid "{0} reassignations finished" +msgstr "Finalizadas {0} reasignacións" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:92 msgid "Edit Work Hours Type" msgstr "Editar tipo de horas de traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:42 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:43 msgid "From Today" msgstr "A partir de hoxe" @@ -3001,135 +3054,141 @@ msgstr "A partir de hoxe" msgid "{0} not supported yet" msgstr "{0} aínda non soportado" -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:52 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:53 msgid "New entry" msgstr "Entrada nova" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:215 -msgid "Some sequences to remove not existed" -msgstr "Algunhas secuencias para borrar non existen" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:104 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:113 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:211 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:105 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:114 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:212 msgid "Resources Load" msgstr "Carga de recursos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:210 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:216 +msgid "Some sequences to remove not existed" +msgstr "Algunhas secuencias para borrar non existen" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:211 msgid "Changes have been canceled" msgstr "Cambios cancelados" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:265 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:280 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:266 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:281 msgid "Machine saved" msgstr "Máquina gardada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:131 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:143 msgid "Create Cost Category" msgstr "Crear categoría de custo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:73 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:63 msgid "March" msgstr "Marzo" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:103 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:104 msgid "Appropriative allocation" msgstr "Asignación apropiativa" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:31 msgid "Assigned criterion requirements" msgstr "Criterios requiridos asignados" +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:127 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:117 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:138 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:157 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:119 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:146 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:117 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:127 msgid "Filter by criteria" msgstr "Filtrar por criterios" -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:36 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:37 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43 msgid "Max value" msgstr "Valor máximo" -#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:21 +#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:22 msgid "Scenarios List" msgstr "Lista de escenarios" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:154 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:156 msgid "The name is not valid, the name must not be null " msgstr "O nome non é válido, non debe ser nulo " -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:139 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:140 msgid "Hours to allocate" msgstr "Horas a asignar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:114 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:115 msgid "A category must be selected" msgstr "Debe seleccionar unha categoría" -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:37 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:134 +msgid "Period" +msgstr "Periodo" + +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:38 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:47 msgid "Spread" msgstr "Propagación" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:93 msgid "Select start date" msgstr "Seleccionar data de inicio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:192 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:151 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:153 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:902 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:189 +msgid "Removed {0}" +msgstr "{0} borrado" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:188 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:214 msgid "Error on showing warning message removing typeOfWorkHours: " msgstr "" "Erro ao mostrar mensaxe de advertencia borrando tipo de horas de traballo: " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:187 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:152 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:883 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:150 -msgid "Removed {0}" -msgstr "{0} borrado" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:800 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:818 msgid "Confirm deleting this worker. Are you sure?" msgstr "Confirmar o borrado deste traballador. ¿Está seguro?" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:61 -msgid "Group name" -msgstr "Nome do grupo" - -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:63 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55 msgid "Start date:" msgstr "Data de inicio:" +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:62 +msgid "Group name" +msgstr "Nome do grupo" + #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:81 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:57 msgid "Role name" msgstr "Nome do rol" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:819 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:837 msgid "This worker was already removed by other user" msgstr "Este traballador xa foi borrado por outro usuario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:678 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:475 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:476 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:816 msgid "h" msgstr "h" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:114 -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" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:612 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:611 msgid "Create Work Report" msgstr "Crear parte de traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:358 +#: navalplanner-webapp/src/main/java/org/navalplanner/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" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:359 msgid "Workable capacity for this period " msgstr "Capacidade de traballo para este período " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java:158 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:218 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java:159 msgid "Cannot be null or empty" msgstr "Non pode ser nulo ou baleiro" @@ -3137,61 +3196,57 @@ msgstr "Non pode ser nulo ou baleiro" msgid "Cannot delete profile: it does not exist anymore" msgstr "Non se pode borrar o perfil: xa non existe" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:224 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:225 msgid "Edit Machine" msgstr "Editar máquina" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java:99 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java:77 msgid "Add Milestone" msgstr "Engadir fito" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:119 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:120 msgid "Assign selected items" msgstr "Asignar elementos seleccionados" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:437 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:438 msgid "init" msgstr "inicio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1211 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1212 msgid "Add new progress measurement" msgstr "Engadir nova medida de progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:541 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:528 msgid "Select for automatic queuing" msgstr "Seleccione para encolar automáticamente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:259 -msgid "Scenarios Management" -msgstr "Administración de escenarios" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:191 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:192 msgid "Project {0} transfered" msgstr "Proxecto {0} transferido" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:95 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:304 +msgid "Scenarios Management" +msgstr "Administración de escenarios" + +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:96 msgid "Create & Assign" msgstr "Crear e asignar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:131 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:141 msgid "Edit User" msgstr "Editar usuario" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:31 -msgid "Print layout" -msgstr "Saída de impresión" - -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:54 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:55 msgid "Maximum/minimum of the estimated hours" msgstr "Máximo/mínimo das horas estimadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:678 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:754 msgid "D" msgstr "D" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:137 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:140 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:111 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:112 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:90 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:93 msgid "Consolidated" msgstr "Consolidado" @@ -3203,55 +3258,55 @@ msgstr "Tipos de partes de traballo" msgid "MonteCarlo method" msgstr "Método de Montecarlo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:984 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1058 msgid "derived exception can not be removed" msgstr "a excepción derivada non se pode borrar" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:216 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:217 msgid "missing code in a material" msgstr "falta o código nun material" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:29 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:108 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:61 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:109 msgid "Customer" msgstr "Cliente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:811 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:74 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:810 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:86 msgid "Hours type" msgstr "Tipo de horas" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:155 -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:209 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:156 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:210 msgid "criterion type name not specified" msgstr "nome do tipo de criterio non especificado" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:219 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:220 msgid "Add Exception" msgstr "Engadir excepción" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:404 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:426 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:450 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:405 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:427 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:451 msgid "cannot be empty" msgstr "non pode ser baleiro" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:146 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:105 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:121 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:147 msgid "Heading Fields" msgstr "Campos de cabeceira" -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:26 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:26 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:48 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:27 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:48 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:49 msgid "from" msgstr "desde" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1385 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1405 msgid "Sigmoid function" msgstr "Función sigmoide" @@ -3260,11 +3315,15 @@ msgstr "Función sigmoide" msgid "Progress type" msgstr "Tipo de progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:580 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:581 msgid "Task {0} : Project is incompatible type with {1}" msgstr "Tarefa {0} : O proxecto ten un tipo incompatible con {1}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:154 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:35 +msgid "Expand taskgroups" +msgstr "Expandir grupos de tarefas" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:155 msgid "" "Time period contains non valid data. Ending data must be older than starting " "date" @@ -3272,113 +3331,33 @@ msgstr "" "O período de tempo contén datos inválidos. A data de fin debe ser maior cá " "de inicio" -#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:41 +#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:42 msgid "Save Project" msgstr "Gardar proxecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:255 -msgid "A type must be selected" -msgstr "Debe seleccionar un tipo" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:317 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:323 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:318 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:324 msgid "Day is not valid" msgstr "O día non é válido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:553 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1024 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:628 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1098 msgid "You should select a start date for the exception" msgstr "Debe seleccionar unha data de inicio para a excepción" -#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:71 +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:72 msgid "Help" msgstr "Axuda" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:129 msgid "Variance At Completion" msgstr "Desviación ao custo final" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:63 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:64 msgid "Exportation options" msgstr "Opcións de exportación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:87 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:521 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:966 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:51 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java:45 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:50 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ScenarioBandboxFinder.java:45 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:50 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:374 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:91 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:48 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:31 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:127 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:39 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:25 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:40 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:72 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:26 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:79 -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:47 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:26 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:33 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:30 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:51 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:106 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:54 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:34 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:26 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:40 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:24 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:138 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:179 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:100 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:141 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:97 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:126 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:166 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:98 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:108 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:149 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:98 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:50 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:51 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:71 -#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:35 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:27 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:108 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:33 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:49 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:26 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:41 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:131 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:155 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:66 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:76 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:30 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:49 -#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:26 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:58 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:40 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:81 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:35 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:48 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:29 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:26 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:37 -#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:26 -msgid "Name" -msgstr "Nome" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:159 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:160 msgid "" "Could not save time period. Time period overlaps with another non-compatible " "time period" @@ -3386,57 +3365,133 @@ msgstr "" "Non se puido gardar o período de tiempo. O período solápase con outro " "período de tempo incompatible" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:161 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:88 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:977 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:493 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:375 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java:46 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:52 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ScenarioBandboxFinder.java:46 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:51 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:108 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:149 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:98 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:89 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:118 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:158 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:138 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:179 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:98 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:100 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:141 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:41 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:74 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:26 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:50 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:52 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:55 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:35 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:58 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:41 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:82 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:40 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:80 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:45 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:67 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:77 +#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:31 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:50 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:80 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:32 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:92 +#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:115 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:72 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:42 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:156 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:39 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:49 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:30 +msgid "Name" +msgstr "Nome" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:162 msgid "Delete task" msgstr "Borrar tarefa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:68 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:69 msgid "Seconds" msgstr "Segundos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:107 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:108 msgid "please, select an item" msgstr "por favor, seleccione un elemento" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:175 -msgid "Day of week" -msgstr "Día da semana" - -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:21 -msgid "Companies List" -msgstr "Lista de empresas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:374 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:392 msgid "Time Start cannot be null" msgstr "A hora de inicio non pode ser nula" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1360 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:22 +msgid "Companies List" +msgstr "Lista de empresas" + +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:208 +msgid "Day of week" +msgstr "Día da semana" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1380 msgid "Stretches with Interpolation" msgstr "Tramos con interpolación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:287 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:49 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:332 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:41 msgid "Hours Worked Per Resource" msgstr "Horas traballadas por recurso" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java:145 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java:146 msgid "The end date cannot be before the init date" msgstr "A data de fin non pode ser anterior á data de inicio" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:144 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:145 msgid "cost assignment with end date less than start date" msgstr "a asignación de custo ten data de fin anterior á de inicio" -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:62 -msgid "Maximum/minimum of the worked hours" -msgstr "Máximo/mínimo das horas traballadas" - -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:34 -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:25 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:35 msgid "Category name" msgstr "Nome da categoría" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:765 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:63 +msgid "Maximum/minimum of the worked hours" +msgstr "Máximo/mínimo das horas traballadas" + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:766 msgid "Not the same material, impossible to update" msgstr "Non é o mesmo material, imposible actualizar" @@ -3444,173 +3499,172 @@ msgstr "Non é o mesmo material, imposible actualizar" msgid "NavalPlan: Work And Progress Per Task" msgstr "NavalPlan: Traballo e progreso por tarefa" -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:56 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:64 msgid "Main menu" msgstr "Menú principal" -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:21 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:22 msgid "NavalPlan: Progress" msgstr "NavalPlan: Progreso" -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:30 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:31 msgid "MonteCarlo" msgstr "Montecarlo" -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:65 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:49 msgid "Duration" msgstr "Duración" -#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:37 +#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:38 msgid "Create From Template" msgstr "Crear a partir de modelo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:380 +#: navalplanner-webapp/src/main/java/org/navalplanner/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." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:149 -#: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:150 +#: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:29 msgid "Schedule" msgstr "Planificar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:163 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:35 +#: navalplanner-webapp/src/main/webapp/common/error.zul:40 +msgid "Exception type:" +msgstr "Tipo de excepción:" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:164 msgid "Unexpected: {0}" msgstr "Inesperado: {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:97 -msgid " {0}s" -msgstr " {0}s" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:112 +msgid "s" +msgstr "s" -#: navalplanner-webapp/src/main/webapp/planner/main.zul:60 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:61 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:50 msgid "Notes" msgstr "Notas" -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:20 -msgid "NavalPlan: Units" -msgstr "NavalPlan: Unidades" - -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:22 -msgid "NavalPlan: Transfer Projects Between Scenarios" -msgstr "NavalPlan: Transferir proxectos entre escenarios" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:224 msgid "Connect" msgstr "Conectar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:220 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:21 +msgid "NavalPlan: Units" +msgstr "NavalPlan: Unidades" + +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:23 +msgid "NavalPlan: Transfer Projects Between Scenarios" +msgstr "NavalPlan: Transferir proxectos entre escenarios" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:221 msgid "Allocation: [{0},{1}]" msgstr "Asignación: [{0},{1}]" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:193 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:194 msgid "Changes saved" msgstr "Cambios gardados" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1263 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1282 msgid "See scheduling" msgstr "Ver planificación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:106 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:337 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:107 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:338 msgid "Progress measurements" msgstr "Medidas de progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1210 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1211 msgid "Add measure" msgstr "Engadir medida" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java:51 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:469 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:472 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java:52 #: navalplanner-webapp/src/main/webapp/planner/editTask.zul:68 msgid "Subcontract" msgstr "Subcontratar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:243 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:253 msgid "Work report saved" msgstr "Parte de traballo gardado" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:120 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:56 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:40 -msgid "End" -msgstr "Fin" - -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:56 -msgid "Found resources" -msgstr "Recursos atopados" - -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29 -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30 msgid "Relationship" msgstr "Relación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1365 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:52 +msgid "Found resources" +msgstr "Recursos atopados" + +#: navalplanner-webapp/src/main/webapp/planner/main.zul:57 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:41 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:121 +msgid "End" +msgstr "Fin" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1366 msgid "The date is not valid, the date must be not empty" msgstr "A data non é válida, non debe ser baleira" -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:25 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:26 msgid "User login name" msgstr "Nome de usuario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:272 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:317 msgid "Cost Categories" msgstr "Categorías de custo" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:267 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:312 msgid "criterion type not specified" msgstr "tipo de criterio non especificado" -#: navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:22 -msgid "NavalPlan: Companies" -msgstr "NavalPlan: Empresas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:142 -msgid "must be not empty" -msgstr "non pode ser baleiro" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:74 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64 msgid "April" msgstr "Abril" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:69 -msgid "Show all resource assignments" -msgstr "Mostrar todas as asignacións de recursos" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:143 +msgid "must be not empty" +msgstr "non pode ser baleiro" -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:21 +#: navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:23 +msgid "NavalPlan: Companies" +msgstr "NavalPlan: Empresas" + +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:22 msgid "Users List" msgstr "Lista de usuarios" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:26 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:54 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:56 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:55 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:57 msgid "Task quality forms" msgstr "Formularios de calidade de tarefa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:526 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:601 msgid "Not working day" msgstr "Día non laborable" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:29 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:135 msgid "Cost category" msgstr "Categoría de custo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:688 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:689 msgid "It can not be deleted. At least one sequence is necessary." msgstr "Non se pode borrar. Polo menos unha secuencia é necesaria." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java:73 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java:74 msgid "Resource allocation" msgstr "Asignación de recursos" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:50 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:51 msgid "Amount work" msgstr "Cantidade de traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:170 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:171 msgid "please, select a quality form" msgstr "por favor, seleccione un formulario de calidade" @@ -3618,210 +3672,197 @@ msgstr "por favor, seleccione un formulario de calidade" msgid "Select entity:" msgstr "Seleccione entidade:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:399 +#: navalplanner-webapp/src/main/java/org/navalplanner/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." -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:63 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:64 msgid "Unindent selected task" msgstr "Desindentar tarefa seleccionada" -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:43 -msgid "Customer reference code" -msgstr "Código de referencia do cliente" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:61 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:62 msgid "Constraint" msgstr "Restrición" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:149 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 +msgid "Customer reference code" +msgstr "Código de referencia do cliente" + +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150 msgid "Add New Label Type Field" msgstr "Engadir novo campo de tipo de etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:288 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:51 -msgid "Hours Worked Per Resource In A Month" -msgstr "Horas traballadas por recurso nun mes" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:155 msgid "Create Exception Day Type" msgstr "Crear tipo de día de excepción" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:384 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:333 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:41 +msgid "Hours Worked Per Resource In A Month" +msgstr "Horas traballadas por recurso nun mes" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:402 msgid "Time finish cannot be null" msgstr "A hora de fin non pode ser nula" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:115 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:116 msgid "Customer reference" msgstr "Referencia del cliente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:328 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:148 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:454 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:747 #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:145 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:660 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:739 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:864 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:897 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:906 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:929 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:516 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:526 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:758 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:461 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:153 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:329 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:517 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:527 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:662 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:741 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:866 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:916 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:925 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:948 msgid "Information" msgstr "Información" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:928 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:947 msgid "Sorry, you do not have permissions to access this project" msgstr "Sentímolo, non ten permisos para acceder a este proxecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:491 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:492 msgid "END" msgstr "FIN" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:221 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:223 msgid "Worker saved" msgstr "Traballador gardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:260 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:261 msgid "can not pass until the previous item is passed." msgstr "non se pode pasar mentres o elemento anterior non sexa pasado." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementModel.java:205 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementModel.java:206 msgid "New hours group " msgstr "novo grupo de horas " -#: navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:21 +#: navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:22 msgid "NavalPlan: Quality Forms" msgstr "NavalPlan: Formularios de calidade" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:457 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:460 msgid "Assign element to queue manually" msgstr "Asignar elemento á cola manualmente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:215 -msgid "Resource: {0} " -msgstr "Recurso: {0} " - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:462 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:463 msgid "percentage cannot be duplicated" msgstr "a porcentaxe non pode estar duplicada" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:54 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:216 +msgid "Resource: {0} " +msgstr "Recurso: {0} " + +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:55 msgid "Edit Template" msgstr "Editar modelo" -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:26 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:27 msgid "Heading" msgstr "Cabeceira" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:112 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:114 msgid "finish not later than" msgstr "acabar non despois de" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:279 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:324 msgid "Work Hours" msgstr "Horas de traballo" -#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:163 +#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:164 msgid "Company ID already used. It has to be be unique" msgstr "NIF da empresa xa está sendo usado. Debe ser único" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:121 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:122 msgid "There is no material category with this code" msgstr "Non hai ningunha categoría de materiais con este código" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java:187 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java:188 msgid "Percentages should sum 100" msgstr "As porcentaxes deberían sumar 100" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:283 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:284 msgid "Could not save machine" msgstr "Non se puido gardar a máquina" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:80 -msgid "Unable to convert value to {0} type" -msgstr "No se puido convertir o valor a tipo {0}" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:334 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:339 msgid "The calendar exception type not found" msgstr "Tipo de excepción de calendario non atopado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:199 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:81 +msgid "Unable to convert value to {0} type" +msgstr "No se puido convertir o valor a tipo {0}" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:220 msgid "Worker must be not-null" msgstr "O traballador non debe ser nulo" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1049 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1067 msgid "Some criterion satisfactions overlap in time" msgstr "Algúns criterios satisfeitos solápanse no tempo" -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:48 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:49 msgid "Value last progress measurement" msgstr "Valor da última medida de progreso" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:43 msgid "Worker assignments" msgstr "Asignacións de traballador" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:303 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:126 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:153 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:220 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:172 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:408 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:430 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:501 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:1034 -#, java-format +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:147 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:174 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:402 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:173 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:409 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:431 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:533 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:221 msgid "{0} already exists" msgstr "{0} xa existe" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:309 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:314 msgid "Create Worker" msgstr "Crear traballador" -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:37 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:38 msgid "Code " msgstr "Código" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:41 -msgid "Paper size" -msgstr "Tamaño de papel" - #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:52 msgid "Password confirmation" msgstr "Confirmación de contrasinal" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:75 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:88 msgid "Work Report" msgstr "Parte de traballo" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:67 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:68 msgid "Indent selected task" msgstr "Indentar tarefa seleccionada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:189 -msgid "" -"Cannot delete type of work hours. It is being used at this moment in some " -"cost category." -msgstr "" -"Non se pode borrar o tipo de hora de traballo. Está sendo usada neste " -"momento nalgunha categoría de custo." - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:278 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:323 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:115 msgid "Unit Measures" msgstr "Unidades de medida" +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:39 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:63 msgid "Show progress" msgstr "Mostrar progreso" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:139 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:140 msgid "Work" msgstr "Traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:452 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:459 msgid "" "The task has got progress consolidations. It must delete all consolidations " "to change the resource allocation type " @@ -3829,22 +3870,17 @@ msgstr "" "A tarefa ten consolidacións de progreso. Debe borrar as consolidacións para " "cambiar o tipo de asignación de recursos " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:532 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:120 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:402 -#: navalplanner-webapp/src/main/webapp/common/event_error.zul:21 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:121 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:626 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403 msgid "Error" msgstr "Erro" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:131 msgid "Cost Performance Index" msgstr "Eficiencia en custo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:128 -msgid "ETC" -msgstr "ETC" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:181 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:182 msgid "" "Criterion is not valid, the criterion overlap other criterionSatisfaction " "whith same criterion" @@ -3852,11 +3888,15 @@ msgstr "" "Criterion non é válido, outro criterionSatisfaction solápase co mesmo " "criterion" -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:96 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:129 +msgid "ETC" +msgstr "ETC" + +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:104 msgid "Log out" msgstr "Saír" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:23 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:24 msgid "Add new configuration unit" msgstr "engadir nova unidade de configuración" @@ -3864,12 +3904,7 @@ msgstr "engadir nova unidade de configuración" msgid "Main preferences" msgstr "Preferencias principais" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationCommand.java:66 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:81 -msgid "Progress consolidation" -msgstr "Consolidación de progreso" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:179 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:180 msgid "" "Criterion is not valid, it overlaps other criterionSatisfaction with the " "same criterion" @@ -3877,172 +3912,167 @@ msgstr "" "Criterion non válido, outro criterionSatisfaction solápase co mesmo " "criterionType" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:163 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationCommand.java:67 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:82 +msgid "Progress consolidation" +msgstr "Consolidación de progreso" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:246 msgid "Label type saved" msgstr "Tipo de etiqueta gardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:418 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:567 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:419 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:568 msgid "missing field name in a description value" msgstr "falta o nome de campo nun valor de descrición" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:46 msgid "Add new worker assignment" msgstr "Engadir nova asignación de traballador" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:440 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:441 msgid "Show all elements" msgstr "Mostrar todos os elementos" -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:65 -msgid "Limited resource" -msgstr "Recursos limitantes" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:148 +msgid "It couldn't complete all the reassignations" +msgstr "No se puideron completar todas as reasignacións" #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:77 msgid "Show dependencies:" msgstr "Mostrar dependencias:" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:42 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:66 +msgid "Limited resource" +msgstr "Recursos limitantes" + +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:27 msgid "Task Information" msgstr "Información da tarefa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:137 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:139 msgid "Hours Group at " msgstr "Grupo de horas en " -#: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:26 +#: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:27 msgid "Your session has expired after inactivity period. Please log in again." msgstr "" "A súa sesión expirou tras un tiempo de inactividade. Por favor, inicie " "sesión de novo." -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:61 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:59 -msgid "Total Estimated hours" -msgstr "Horas totais estimadas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:165 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:166 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:191 msgid "SPREAD" msgstr "PROPAGACIÓN" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:304 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:309 msgid "a day is empty" msgstr "un día está baleiro" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:121 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:122 msgid "Budgeted Cost Work Scheduled" msgstr "Custo de traballo presupostado planificado" -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:56 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:57 msgid "Name cannot be null or empty" msgstr "O nome non pode ser nulo ou baleiro" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:109 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:340 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:110 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:341 msgid "Progress measurements: " msgstr "Medidas de progreso: " -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:31 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:32 msgid "Queue Element Information" msgstr "Información de elemento de cola" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:111 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:136 msgid "Start Date" msgstr "Data de inicio" -#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:31 msgid "Create Order" msgstr "Crear proxecto" -#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:1 -msgid "NavalPlan: Resources List" -msgstr "NavalPlan: Lista de recursos" - -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:22 msgid "Virtual Workers Groups List" msgstr "Lista de grupos de traballadores virtuais" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 msgid "Cost Variance" msgstr "Desviación en custo" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:469 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:470 msgid "criterion type does not allow resource hierarchy" msgstr "o tipo de criterio non permite xerarquía de recursos" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:136 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:139 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:149 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:89 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:150 msgid "Total" msgstr "Total" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:47 -msgid "A1" -msgstr "A1" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:221 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:98 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:222 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:99 msgid "Invalidate" msgstr "Invalidar" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:102 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:103 msgid "Budget hours" msgstr "Horas do presuposto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:162 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:165 msgid "Edit task: {0}" msgstr "Editar tarefa: {0}" -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:52 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:53 msgid "Select destination" msgstr "Seleccionar destino" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:528 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:268 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:529 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:269 msgid "must be greater than the previous date." msgstr "debe ser maior cá data anterior." -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:21 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:22 msgid "NavalPlan: Advanced allocation" msgstr "NavalPlan: Asignación avanzada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1458 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java:551 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1481 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java:583 msgid "Show all" msgstr "Mostrar todo" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:44 -msgid "A4" -msgstr "A4" - -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:37 -msgid "Estimated hours" -msgstr "Horas estimadas" - -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:27 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:57 msgid "Default price" msgstr "Prezo por defecto" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:163 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:38 +msgid "Estimated hours" +msgstr "Horas estimadas" + +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:116 msgid "Apply tab changes" msgstr "Aplicar cambios da pestana" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:236 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:246 msgid "passwords don't match" msgstr "os contrasinais non coinciden" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:71 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:85 +msgid "Day properties" +msgstr "Propiedades do día" + +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:72 msgid "Hours groups" msgstr "Grupos de horas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:182 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:183 msgid "Transfer" msgstr "Transferir" -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:21 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:22 msgid "Work Hours Types List" msgstr "Lista de tipos de horas de traballo" @@ -4050,29 +4080,29 @@ msgstr "Lista de tipos de horas de traballo" msgid "new milestone" msgstr "novo fito" -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:46 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:47 msgid "Value last progress reported" msgstr "Valor último progreso notificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:254 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:299 msgid "Report Progress" msgstr "Notificar progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:146 +#: navalplanner-webapp/src/main/java/org/navalplanner/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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:116 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:126 msgid "Create User" msgstr "Crear usuario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:307 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:309 msgid "Schedule from start to deadline" msgstr "Planificar dende o principio á data límite" -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:49 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:51 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:53 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:50 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:52 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:54 msgid "Estimated days" msgstr "Días estimadas" @@ -4080,15 +4110,15 @@ msgstr "Días estimadas" msgid "Reference date" msgstr "Data de referencia" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:45 msgid "Selected node:" msgstr "Nodo seleccionado:" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:73 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:74 msgid "Progress Evolution" msgstr "Evolución do progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:251 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:252 msgid "Create new project from template" msgstr "Crear novo proxecto a partir de modelo" @@ -4096,48 +4126,44 @@ msgstr "Crear novo proxecto a partir de modelo" msgid "NavalPlan: Task Scheduling Status In Project" msgstr "NavalPlan: Estado de planificación de proxecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:111 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:112 msgid "Complete, Partially or Not Scheduled. (Drag and drop to move tasks)" msgstr "" "Completa, parcialmente ou non planificada. (Pinche e arrastre para mover " "tarefas)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 -msgid "CV" -msgstr "CV" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:135 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:88 msgid "Original" msgstr "Orixinal" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:30 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 +msgid "CV" +msgstr "CV" + +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:31 msgid "Stretches function configuration" msgstr "Configuración da función de tramos" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:57 -msgid "Week" -msgstr "Semana" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:292 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:306 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:295 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:309 msgid "Not indentable" msgstr "Non indentable" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:490 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:69 +msgid "Resource allocation type" +msgstr "Tipo de asignación de recursos" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:491 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:70 msgid "List of materials for all categories (select one to filter)" msgstr "" "Lista de materiais paa tódalas categorías (seleccione unha para filtrar)" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:68 -msgid "Resource allocation type" -msgstr "Tipo de asignación de recursos" - -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:98 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:99 msgid "User disabled" msgstr "Usuario deshabilitado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:573 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:728 msgid "In the available periods {0} only {1} hours are available." msgstr "Nos períodos dispoñibles {0} só hai dispoñibles {1} horas." @@ -4145,32 +4171,33 @@ msgstr "Nos períodos dispoñibles {0} só hai dispoñibles {1} horas." msgid "Association with profiles" msgstr "Asociación con perfís" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:626 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:627 msgid "Task {0} : Duplicate code in DB" msgstr "Tarefa {0} : Código duplicado en BD" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:120 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:25 +#: navalplanner-webapp/src/main/webapp/common/error.zul:30 +msgid "Message - {0}" +msgstr "Mensaxe - {0}" + +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:121 msgid "worker's surname not specified" msgstr "apelidos do traballador non especificados" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:210 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:211 msgid "Error on removing workReportType: " msgstr "Erro ao borrar tipo de parte de traballo: " -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:47 -#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:41 msgid "Save changes" msgstr "Gardar cambios" -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:44 -msgid "Select source" -msgstr "Seleccionar orixe" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:191 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:192 msgid "Total dedication" msgstr "Dedicación total" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:668 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:669 msgid "" "You can not remove the task \"{0}\" because of this or any of its children " "are already in use in some work reports" @@ -4178,15 +4205,19 @@ msgstr "" "Non se pode borrar a tarefa \"{0}\" porque algún dos seus fillos está a " "usarse nalgún parte de traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:807 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:45 +msgid "Select source" +msgstr "Seleccionar orixe" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:825 msgid "Worker deleted" msgstr "Traballador borrado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:726 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:727 msgid "Select entity, please" msgstr "Seleccionar entidade, por favor" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:222 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:293 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: " @@ -4194,30 +4225,31 @@ msgstr "A data do tramo non debe ser menor cá data de fin da tarefa: " msgid "Number of digits:" msgstr "Número de díxitos:" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:37 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:43 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:38 msgid "Subcontratation date" msgstr "Data de subcontratación" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:58 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:141 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:93 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:182 msgid "Day" msgstr "Día" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:150 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:233 msgid "Edit Label Type" msgstr "Editar tipo de etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:912 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1172 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:349 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:911 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1197 msgid "Please, select an item" msgstr "Por favor, seleccione un elemento" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:179 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:180 msgid "Work report type saved" msgstr "Tipo de partes de traballo gardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1123 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1122 msgid "Cannot be higher than finish hour" msgstr "Non pode ser posterior á data de fin" @@ -4225,12 +4257,12 @@ msgstr "Non pode ser posterior á data de fin" msgid "Prefix" msgstr "Prefixo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:63 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:64 msgid "New Template element" msgstr "Novo elemento de modelo" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:55 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:56 msgid "Subcontracted code" msgstr "Código subcontratado" @@ -4238,95 +4270,95 @@ msgstr "Código subcontratado" msgid "NavalPlan: Hours Worked Per Worker In A Month" msgstr "NavalPlan: Horas traballadas por traballador nun mes" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:249 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:320 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:251 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:325 msgid "The base calendar parent not found" msgstr "Calendario base pai non atopado" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:138 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:141 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:94 msgid "Non Consolidated" msgstr "Non consolidado" -#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:33 +#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:34 msgid "Reassigning type" msgstr "Tipo de reasignación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:291 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:295 msgid "Edit Virtual Workers Group" msgstr "Editar grupo de traballadores virtuais" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:438 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:441 msgid "Edit limiting resource element" msgstr "Editar elemento de recurso limitante" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:380 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:133 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:156 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:82 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:381 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:157 msgid "Position" msgstr "Posición" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:861 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:862 msgid "The field name must be unique, not null and not empty" msgstr "O nome do campo debe ser único, non nulo e non baleiro" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:96 -msgid "Edit work report" -msgstr "Editar parte de traballo" - -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:103 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:104 msgid "Incorrect authentication" msgstr "Identificación incorrecta" +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:112 +msgid "Edit work report" +msgstr "Editar parte de traballo" + +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:42 #: navalplanner-webapp/src/main/webapp/planner/editTask.zul:53 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:41 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:35 msgid "Edit task" msgstr "Editar tarefa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:44 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:45 msgid "Limiting resources (project)" msgstr "Recursos limitantes (proxecto)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1173 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1174 msgid "" "Progress measurements that are reported by quality forms can not be removed" msgstr "" "As medidas de progreso notificadas por formularios de calidade non se poden " "modificar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:763 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:764 msgid "A description field of the same name already exists." msgstr "Xa existe un campo de descrición co mesmo nome." -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:44 msgid "Current value" msgstr "Valor actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:164 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:165 msgid "Edit Quality Form" msgstr "Editar formulario de calidade" -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:79 -msgid "Save and Continue" -msgstr "Gardar e continuar" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:822 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:823 msgid "Duplicate progress assignment for task " msgstr "Asignación de progreso duplicada para a tarefa" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:51 -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:45 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:48 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:54 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:83 +msgid "Save and Continue" +msgstr "Gardar e continuar" + +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:46 msgid "Zoom level" msgstr "Nivel de zoom" -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:27 -#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:159 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:28 msgid "Quality form" msgstr "Formulario de calidade" -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:97 msgid "Go!" msgstr "Ir!" @@ -4334,83 +4366,87 @@ msgstr "Ir!" msgid "Profile data" msgstr "Datos do perfil" -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:271 +msgid "The name of the label is empty." +msgstr "O nome da etiqueta está baleiro." + +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:31 msgid "Configuration" msgstr "Configuración" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeModel.java:98 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeModel.java:99 msgid "It was not possible load entity. Not found. Id: " msgstr "Non foi posible cargar a entidade. Non atopada. Id: " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:559 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:569 msgid "Create Virtual Workers Group" msgstr "Crear grupo de traballadores virtuais" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:845 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:864 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:885 msgid "Hours invested" msgstr "Horas invertidas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:158 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:741 +msgid "Project saved" +msgstr "Proxecto gardado" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:160 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. " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:739 -msgid "Project saved" -msgstr "Proxecto gardado" - -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:44 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:45 msgid "task :" msgstr "tarefa :" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:702 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:712 msgid "ALL" msgstr "TODOS" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:214 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:215 msgid "criterion satisfaction's resource not specified" msgstr "recurso do criterio satisfeito non especificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:522 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:597 msgid "Derived exception" msgstr "Excepción derivada" -#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:21 -msgid "Unit Measures List" -msgstr "Lista de unidades de medida" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:246 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:291 msgid "Machines" msgstr "Máquinas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:179 -msgid "Confirm deleting this profile. Are you sure?" -msgstr "Confirmar o borrado deste perfil. ¿Está seguro?" +#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:22 +msgid "Unit Measures List" +msgstr "Lista de unidades de medida" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:152 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:153 msgid "Couldn't find element: {0}" msgstr "Non se puido atopar o elemento: {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:147 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:222 +msgid "Confirm deleting this profile. Are you sure?" +msgstr "Confirmar o borrado deste perfil. ¿Está seguro?" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:148 msgid "You should select a destination scenario" msgstr "Debe seleccionar un escenario de destino" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:184 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:268 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:185 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:269 msgid "unit type code not found" msgstr "código de tipo de unidade non atopado" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:41 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:42 msgid "Resource :" msgstr "Recurso :" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:160 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:180 msgid "Calendar Exception Type saved" msgstr "Tipo de excepción de calendario gardado" -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:39 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:40 msgid "Destination scenario" msgstr "Escenario de destino" @@ -4422,38 +4458,38 @@ msgstr "Vista da compañía" msgid "NavalPlan: Configuration" msgstr "NavalPlan: Configuración" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:750 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:751 msgid "Not editable for containing more that an hours group." msgstr "Non editable por conter máis dun grupo de horas." -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:24 -msgid "Filter by" -msgstr "Filtrar por" - -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:75 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:76 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:45 msgid "Limiting resource" msgstr "Recurso limitante" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java:57 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:146 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:25 +msgid "Filter by" +msgstr "Filtrar por" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java:58 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:147 msgid "Calendar allocation" msgstr "Asignación de calendario" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:818 +#: navalplanner-webapp/src/main/java/org/navalplanner/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" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:111 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:33 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:85 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:32 msgid "Category" msgstr "Categoría" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:153 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:154 msgid "must be greater than finish date" msgstr "debe ser maior que a data de fin" @@ -4461,81 +4497,80 @@ msgstr "debe ser maior que a data de fin" msgid "NavalPlan: Materials Needs At Date" msgstr "NavalPlan: Necesidades de materiais en data" -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:86 -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:157 -msgid "[generic all workers]" -msgstr "[xenérico todos os traballadores]" - #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:26 msgid "Category data" msgstr "Datos de categoría" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:94 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:79 +msgid "[generic all workers]" +msgstr "[xenérico todos os traballadores]" + +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:103 msgid "Search" msgstr "Buscar" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:125 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:126 msgid "Add New Complementary Field" msgstr "Engadir novo campo complementario" -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:38 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:229 +msgid "Work weeks list" +msgstr "Lista de semanas de traballo" + +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:39 msgid "Source scenario" msgstr "Escenario de origen" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:117 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:118 msgid "%" msgstr "%" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:49 -#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:50 +#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:43 msgid "Remove calendar" msgstr "Borrar calendario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:311 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:255 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:638 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:506 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:138 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1328 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:139 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:648 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:512 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:256 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:312 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java:228 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:655 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1525 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1689 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1347 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:656 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1548 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1712 msgid "must be lower than finish date" msgstr "debe ser anterior á data de fin" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:28 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:758 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:160 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:78 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:69 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:119 -msgid "Resource" -msgstr "Recurso" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:70 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:71 msgid "Total task hours" msgstr "Total de horas de tarefa" -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:45 -msgid "Date last progress reported" -msgstr "Data último progreso notificado" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:757 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:29 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:70 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:135 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:79 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:161 +msgid "Resource" +msgstr "Recurso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/RedirectorSynthetiser.java:122 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/RedirectorSynthetiser.java:123 msgid "Could not load any resource" msgstr "Non se puido cargar un recurso" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:34 -msgid "Material search" -msgstr "Búsqueda de materiais" +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:46 +msgid "Date last progress reported" +msgstr "Data último progreso notificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:289 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:334 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 msgid "Work And Progress Per Project" msgstr "Traballo e progreso por proxecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:362 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:383 msgid "" "You must allow multiple active criteria for this type to use this assignment " "strategy" @@ -4543,100 +4578,108 @@ msgstr "" "Debe permitir múltiples criterios activos para este tipo para usar esta " "estratexia de asignación" -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:31 msgid "sub elements" msgstr "sub elementos" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:157 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:158 msgid "Default Label" msgstr "Etiqueta por defecto" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:101 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:155 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:187 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:108 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:85 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:188 msgid "Close" msgstr "Pechar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:465 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:470 msgid "Specific Allocations" msgstr "Asignacións específicas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateController.java:117 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:270 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:271 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateController.java:126 msgid "error doing reassignation: {0}" msgstr "Erro realizando reasignación: {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:348 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:349 msgid "Time filter" msgstr "Filtrado de tempo" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:59 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:60 msgid "Move selected task up" msgstr "Mover tarefa seleccionada cara arriba" -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:27 msgid "Select criteria set or specific resources for allocation" msgstr "" "Seleccione conxunto de criterios ou recursos específicos para asignación" +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:34 +msgid "Work Report Lines List" +msgstr "Lista de liñas de parte de traballo" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:316 +msgid "Create copy" +msgstr "Crear copia" + #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:27 msgid "Company data" msgstr "Datos da empresa" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:33 -msgid "Work Report Lines List" -msgstr "Lista de liñas de parte de traballo" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:290 -msgid "Create copy" -msgstr "Crear copia" - -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:21 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:22 msgid "Criterions Requirement" msgstr "Criterios requiridos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:207 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:215 msgid "Unit type code cannot be empty" msgstr "O código de tipo de unidade non pode ser baleiro" -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:46 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:47 msgid "Average of the estimated hours" msgstr "Media de horas estimadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:159 -msgid "Create Unit Type" -msgstr "Crear tipo de unidade" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:177 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:239 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:178 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:240 msgid "Quality form saved" msgstr "Formulario de calidade gardado" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:142 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:167 +msgid "Create Unit Type" +msgstr "Crear tipo de unidade" + +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:143 msgid "Label Type fields" msgstr "Campos de tipo de etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:266 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:311 msgid "Users" msgstr "Usuarios" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:102 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:103 msgid "Hours Management" msgstr "Administración de horas" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32 msgid "New task:" msgstr "Nova tarefa:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:88 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:140 +msgid "" +"Please use some of the compatible browsers: Chrome, Firefox, Safari or " +"Epiphany." +msgstr "" +"Por favor utilice algún dos navegadores compatibles: Chrome, Firefox, Safari " +"ou Epiphany." + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:94 msgid "specific allocation" msgstr "asignación específica" -#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:146 +#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:147 msgid "company name has to be unique. It is already used" msgstr "o nome da empresa debe ser único. Xa está a ser usado" -#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:32 +#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:33 msgid "" "Another user has modified the same data, so the operation cannot be safely " "completed." @@ -4644,278 +4687,271 @@ msgstr "" "Outro usuario modificou os mesmos datos, polo tanto a operación non se pode " "completar con seguridade." -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:73 -msgid "Type of day" -msgstr "Tipo de día" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:217 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:231 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:218 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:232 msgid "Template saved" msgstr "Modelo gardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:576 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:577 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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:162 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:172 msgid "User saved" msgstr "Usuario gardado" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:46 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47 msgid "Task quality form name" msgstr "Nombre del formulario de calidad de tarea" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1079 -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:155 -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:160 -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:180 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1097 msgid "Some cost category assignments overlap in time" msgstr "Algunhas asignacións a categorías de custo solápanse no tempo" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:25 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:26 msgid "Imputed hours calculation" msgstr "Cálculo de horas imputadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:117 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:119 msgid "FINISH_NOT_LATER_THAN" msgstr "ACABAR_NON_DESPOIS_DE" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:273 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:274 msgid ": code not found" msgstr ": código non atopado" -#: navalplanner-webapp/src/main/webapp/common/error.zul:36 -#: navalplanner-webapp/src/main/webapp/common/event_error.zul:30 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:51 +#: navalplanner-webapp/src/main/webapp/common/error.zul:55 msgid "Exit session" msgstr "Saír da sesión" -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:30 -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:52 -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:66 -#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineGroupTemplate.java:274 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:53 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:67 msgid "Group" msgstr "Grupo" -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:59 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:27 -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:56 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:62 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:59 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28 msgid "Enabled" msgstr "Activado" -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:29 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:30 msgid "Statistics list " msgstr "Lista de estatísticas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:122 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:143 msgid "Edit Exception Day Type" msgstr "Editar tipo de día de excepción" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:221 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:222 msgid "All resources must be limiting. " msgstr "Todos os recursos deben ser limitantes. " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:326 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:327 msgid "Filter by worker" msgstr "Filtrar por traballadores" -#: navalplanner-webapp/src/main/webapp/resources/machine/machines.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/machine/machines.zul:22 msgid "NavalPlan: Machines" msgstr "NavalPlan: Máquinas" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:46 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:47 msgid "Load due to current project" msgstr "Carga debido ao proxecto actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1274 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1286 msgid "You are going to change the assignment function. Are you sure?" msgstr "Vai cambiar a función de asignación. ¿Está seguro?" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:150 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:200 msgid "There must be at least 2 stretches for doing interpolation" msgstr "Debe haber alo menos dous tramos para facer interpolación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:276 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:321 msgid "Exception Days" msgstr "Días de excepción" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:67 -msgid "Show all labels" -msgstr "Mostrar todas as etiquetas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:295 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:296 msgid "Incompatible update: stored resource is not of type: {0}" msgstr "Actualización incompatible: i recurso almacenado non é de tipo: {0}" -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:137 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:82 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:107 -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:38 -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:41 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:131 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:113 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:97 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:90 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:109 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:75 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:212 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:37 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:41 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:171 -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:39 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:132 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:90 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:114 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:98 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:40 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:133 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:132 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:187 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:38 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:42 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:213 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:42 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:137 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:82 msgid "Save & Continue" msgstr "Gardar e continuar" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:89 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:90 msgid "Scheduling mode" msgstr "Modo de planificación" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:22 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:22 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:52 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:54 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:50 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:23 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:55 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:53 msgid "Filter" msgstr "Filtrar" -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:26 msgid "Assigned locations" msgstr "Ubicacións asignadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:239 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:247 msgid "Unit type saved" msgstr "Tipo de unidade gardado" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:266 -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:128 -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:137 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:267 msgid "Two hour costs with the same type overlap in time" msgstr "Dous custos por hora co mesmo tipo solápanse no tempo" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:48 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:63 -msgid "Report progress" -msgstr "Notificar progreso" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:201 msgid "Create Machine" msgstr "Crear máquina" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:122 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:64 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49 +msgid "Report progress" +msgstr "Notificar progreso" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:123 msgid "ACWP" msgstr "ACWP" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:576 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:731 msgid "The periods available depend on the resource's calendar." msgstr "Os períodos dispoñibles dependen do calendario do recurso." -#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:54 +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:55 msgid "START" msgstr "INICIO" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:65 -msgid "generic machines allocation" -msgstr "asignación xenérica de máquinas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:310 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:312 msgid "Schedule from the deadline to start" msgstr "Planificar dende a data límite ao principio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:467 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:71 +msgid "generic machines allocation" +msgstr "asignación xenérica de máquinas" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:470 msgid "Non limiting resource assignation" msgstr "Asignación de recursos non limitantes" -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:81 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:74 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:86 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:887 +msgid "" +"Deleting this subcontracted project, you are going to lose the relation to " +"report progress. Are you sure?" +msgstr "" +"Borrando este proxecto subcontrado, perderá a relación para notificar " +"progresos. ¿Está seguro?" + +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:82 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:87 msgid "Back" msgstr "Atrás" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:56 msgid "Subcontractor" msgstr "Subcontratista" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:40 -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:32 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:41 msgid "Administration" msgstr "Administración" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:292 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:238 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:621 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:489 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1311 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:631 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:495 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:239 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:293 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java:211 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:637 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1508 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1671 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1330 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:638 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1531 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1694 msgid "must be greater than start date" msgstr "debe ser maior que a data de inicio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:92 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:93 msgid "Create Company" msgstr "Crear empresa" -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:46 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:47 msgid "Cancel and return" msgstr "Cancelar e volver" -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:33 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:30 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:31 msgid "Assign quality form" msgstr "Asignar formulario de calidade" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:386 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:202 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:222 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:387 msgid "Delete item {0}. Are you sure?" msgstr "Borrar elemento {0}. ¿Está seguro?" -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:49 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:50 msgid "Unit measure name" msgstr "Nome da unidade de medida" -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:38 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:39 msgid "worked hours" msgstr "horas traballadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:771 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:143 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:773 +#: navalplanner-webapp/src/main/java/org/navalplanner/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" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:488 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:489 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" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:70 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:106 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:59 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:52 msgid "Allocations" msgstr "Asignacións" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:52 msgid "Task code" msgstr "Código da tarefa" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:49 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132 -msgid "Length" -msgstr "Lonxitude" - -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:84 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:85 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 msgid "Capacity" msgstr "Capacidade" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:177 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:273 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:50 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:133 +msgid "Length" +msgstr "Lonxitude" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:299 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:178 msgid "Create derived" msgstr "Crear derivado" @@ -4923,62 +4959,62 @@ msgstr "Crear derivado" msgid "it must be greater than zero" msgstr "debe ser maior que cero" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:129 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:130 msgid "must be a real positive number" msgstr "debe ser un número real positivo" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:110 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:121 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:111 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:122 msgid "Total hours task" msgstr "Total de horas de tarefa" -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:32 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:33 msgid "No Allocations have been done" msgstr "Non se fixeron asignacións" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:392 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:409 msgid "Removed calendar \"{0}\"" msgstr "Borrado calendario \"{0}\"" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1065 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1084 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:23 msgid "Create project" msgstr "Crear proxecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:106 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:108 msgid "START_IN_FIXED_DATE" msgstr "COMEZAR_EN_DATA_FIXA" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:49 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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1299 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1300 msgid "" "The date is not valid, the date must be unique for this progress assignment" msgstr "A data non é válida, debe ser única para esta asignación de progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:112 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:113 msgid "Edit Criterion Type" msgstr "Editar tipo de criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:79 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:81 msgid "as soon as possible" msgstr "tan pronto como sexa posible" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:426 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:445 msgid "The code cannot be empty." msgstr "O código non pode estar baleiro" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 msgid "Human hours per machine working hour within configuration unit" msgstr "" "Horas humanas por hora de traballo de máquina dentro de unidade de " "configuración" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:112 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:113 msgid "" "Could not add those authorizations to user {0} because they were already " "present." @@ -4986,34 +5022,30 @@ msgstr "" "Non se engadiron esas actualizacións ao usuario {0} porque xa estaban " "presentes." -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:102 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:46 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:47 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:103 msgid "New work report" msgstr "Novo parte de traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:844 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:662 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:862 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:668 msgid "yes" msgstr "si" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:45 -msgid "A3" -msgstr "A3" - -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:112 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:113 msgid "Select gap" msgstr "Seleccionar intervalo" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:62 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:63 msgid "Date Finish" msgstr "Data de fin" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:223 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:94 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:224 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:95 msgid "Validate" msgstr "Validar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:142 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:143 msgid "This resource has already been added." msgstr "Este recurso xa fora engadido." @@ -5021,13 +5053,13 @@ msgstr "Este recurso xa fora engadido." msgid "Calendar exception types" msgstr "Tipos de excepcións de calendario" -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:23 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:34 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:24 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:33 msgid "Cost category assignment" msgstr "Asignación de categoría de custo" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:149 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:150 msgid "missing code in a hour cost" msgstr "falta código nun custo por hora" @@ -5035,63 +5067,64 @@ msgstr "falta código nun custo por hora" msgid "All workers" msgstr "Todos os traballadores" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:221 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:304 msgid "Label saved" msgstr "Etiqueta gardada" -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector_combo.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector_combo.zul:25 msgid "Select criteria or resources" msgstr "Seleccione criterios ou recursos" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:25 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:23 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:26 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:24 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:24 msgid "Select required criteria set and press filter button" msgstr "Seleccione conxunto de criterios requeridos e pulse o botón de filtrar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:238 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:311 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:731 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:114 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:229 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:231 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:233 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:280 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:380 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:135 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:311 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1019 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1280 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:115 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java:147 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:310 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:228 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:230 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:232 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:945 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1204 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:44 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:42 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:43 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:49 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:82 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:86 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:38 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:48 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:127 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:46 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:43 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:72 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:95 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:732 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:42 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:48 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:44 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:50 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:84 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:88 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:43 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:53 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:43 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:54 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:72 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:128 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:47 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:93 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:43 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:63 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:33 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:37 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:44 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:40 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:134 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:32 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:93 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:41 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:42 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:48 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:39 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:52 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:39 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:135 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:44 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:42 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:42 msgid "cannot be null or empty" msgstr "non pode ser nulo ou baleiro" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:631 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:632 msgid "Hours Group {0} : Duplicate code in DB" msgstr "Grupo de horas {0} : Clave duplicada en BD" @@ -5099,24 +5132,24 @@ msgstr "Grupo de horas {0} : Clave duplicada en BD" msgid "NavalPlan: Work And Progress Per Project" msgstr "NavalPlan: Traballo e progreso por proxecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:51 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:60 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:43 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:52 msgid "New code" msgstr "Novo código" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java:90 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java:91 msgid "The progress type cannot be modified" msgstr "O tipo de progreso non pode ser modificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:441 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:412 msgid "Calculate Resources per Day" msgstr "Calcular recursos por día" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:995 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:996 msgid "The index fields and labels must be uniques and consecutives" msgstr "Os campos de índice e as etiquetas deben ser únicas e consecutivas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:249 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:250 msgid "" "Are you sure of changing the resource type? You will lose the criterions " "with different resource type." @@ -5124,7 +5157,7 @@ msgstr "" "¿Está seguro de cambiar o tipo de recurso? Os criterios con diferente tipo " "de recurso perderanse." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:129 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130 msgid "Estimate To Complete" msgstr "Estimación do custo pendente" @@ -5132,91 +5165,103 @@ msgstr "Estimación do custo pendente" msgid "NavalPlan: Estimated/Planned Hours Per Task" msgstr "NavalPlan: Horas estimadas/planificadas por tarefa" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:29 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:109 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:30 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:84 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:29 msgid "Unit type" msgstr "Tipo de unidade" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:41 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:42 msgid "Load due to other assignments" msgstr "Carga debido a outras asignacións" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:61 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:62 msgid "Sum of all task leafs imputed hours" msgstr "Suma de horas imputadas por todas as tarefas folla" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:638 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:644 msgid "This machine was already removed by other user" msgstr "Esta máquina xa foi borrada por outro usuario" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:25 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:26 msgid "Calendar data" msgstr "Datos do calendario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:248 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:293 msgid "Work Reports" msgstr "Partes de traballo" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:168 +#: navalplanner-business/src/main/java/org/navalplanner/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" -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:21 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:22 msgid "Cost Categories List" msgstr "Lista de categorías de custo" -#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:108 +#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:109 msgid "code is already used" msgstr "o código xa está a ser usado" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:151 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:152 msgid "Criterion Requirements" msgstr "Criterios requiridos" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:128 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:143 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:176 -msgid "Workable Time" -msgstr "Tempo traballable" +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:148 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:185 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:212 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:65 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34 +msgid "Extra Effort" +msgstr "Esforzo extra" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:55 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:260 +msgid "Already exists other label with the same name" +msgstr "Xa existe outra etiqueta co mesmo nome" + +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:56 msgid "Move selected task down" msgstr "Mover tarefa seleccionada cara abaixo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:134 +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. Isto " +"non é seguro" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:32 msgid "Customer Reference" msgstr "Referencia do cliente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:776 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:133 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:146 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:778 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:147 msgid "spread values are not valid, at least one value should be true" msgstr "" "os valores de propagación non son válidos, alo menos un debe ser verdadeiro" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:88 -msgid "Create and assign label" -msgstr "Crear e asignar etiqueta" - -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:41 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:42 msgid "Optimistic" msgstr "Optimista" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:89 +msgid "Create and assign label" +msgstr "Crear e asignar etiqueta" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 msgid "SV" msgstr "SV" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1460 -msgid "Filter work reports" -msgstr "Filtrar partes de traballo" - #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:83 msgid "Our company login" msgstr "Nome de usuario da nosa empresa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:369 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1483 +msgid "Filter work reports" +msgstr "Filtrar partes de traballo" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:395 msgid "" "Default calendar cannot be removed. Please, change the default calendar in " "the Configuration window before." @@ -5225,17 +5270,17 @@ msgstr "" "calendario por defecto na ventá de configuración." #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:842 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:274 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:863 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:586 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:62 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:48 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:45 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:48 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:587 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:884 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:319 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:63 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:46 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:49 msgid "Progress" msgstr "Progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:127 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:128 msgid "" "This criterion type cannot be deleted because it has assignments to projects " "or resources" @@ -5243,7 +5288,7 @@ msgstr "" "Este tipo de criterio non se pode borrar porque ten asignacións a proxectos " "ou recursos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1220 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1221 msgid "All progress types have already been assigned." msgstr "Xa se asignaron todos os tipos de progreso." @@ -5251,23 +5296,23 @@ msgstr "Xa se asignaron todos os tipos de progreso." msgid "Price per hour" msgstr "Prezo por hora" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:208 -msgid "Project: {0} " -msgstr "Proxecto: {0} " - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:269 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:314 msgid "Calendars" msgstr "Calendarios" -#: navalplanner-webapp/src/main/webapp/common/page_not_found.zul:20 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:209 +msgid "Project: {0} " +msgstr "Proxecto: {0} " + +#: navalplanner-webapp/src/main/webapp/common/page_not_found.zul:21 msgid "NavalPlan: Page not found" msgstr "NavalPlan: Páxina non atopada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:337 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:355 msgid "The date cannot be null" msgstr "A data non pode ser nula" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:315 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:316 msgid "" "Another task in the same branch is already reporting progress for this " "quality form" @@ -5275,41 +5320,45 @@ msgstr "" "Outra tarefa na mesma rama xa está informando dun progreso para este " "formulario de calidade" -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:32 msgid "Show only current satisfied criteria" msgstr "Mostrar só os criterios satisfeitos actualmente" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:91 -msgid "Latest date" -msgstr "Data máis tardía" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:372 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:392 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:211 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:231 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:373 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:393 msgid "Error on showing delete confirm" msgstr "Erro ao mostrar a confirmación de borrado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:688 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92 +msgid "Latest date" +msgstr "Data máis tardía" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:671 msgid "Sum of all rows" msgstr "Suma de todas as filas" -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:87 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:88 msgid "Group by weeks" msgstr "Agrupar por semanas" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:72 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:82 msgid "Finish hour" msgstr "Hora de fin" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:175 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:199 msgid "Done {0} of {1}" msgstr "Feito {0} de {1}" -#: navalplanner-webapp/src/main/webapp/users/users.zul:22 +#: navalplanner-webapp/src/main/webapp/users/users.zul:23 msgid "NavalPlan: Accounts" msgstr "NavalPlan: Contas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:140 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:23 +msgid "NavalPlan: Scenarios Management" +msgstr "NavalPlan: Xestión de escenarios" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:194 msgid "" "Last stretch should have one hundred percent for length and amount of work " "percentage" @@ -5317,42 +5366,38 @@ msgstr "" "O último tramo debe ter 100% de porcentaxes de lonxitude e cantidade de " "traballo" -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:22 -msgid "NavalPlan: Scenarios Management" -msgstr "NavalPlan: Xestión de escenarios" - -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:100 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:79 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 msgid "Filter by projects" msgstr "Filtrar por proxectos" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:22 -msgid "Criteria of selected type " -msgstr "Criterios do tipo seleccionado " - -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32 msgid "Each worker configuration unit name" msgstr "Nome da unidade de configuración de cada traballador" -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:41 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:23 +msgid "Criteria of selected type " +msgstr "Criterios do tipo seleccionado " + +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:42 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:224 msgid "Active" msgstr "Activo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1257 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1258 msgid "This progress measurement can not be in " msgstr "Esta medida de progreso non pode estar en " -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:29 msgid "Inherited labels" msgstr "Etiquetas herdadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1242 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1243 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." @@ -5361,21 +5406,21 @@ msgstr "" "consolidado. Débense borrar as consolidacións de todas as súas medidas de " "progreso." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:909 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:289 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:292 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:910 msgid "Unindent" msgstr "Desindentar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:931 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1389 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:932 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1390 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" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:49 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:50 msgid "Direct labels" msgstr "Etiquetas directas" -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:91 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:92 msgid "Log in" msgstr "Entrar" @@ -5383,96 +5428,96 @@ msgstr "Entrar" msgid "Project name" msgstr "Nome do proxecto" -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:52 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:53 msgid "Precision" msgstr "Precisión" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:371 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:372 msgid "missing code in a work report line" msgstr "falta código nunha liña de parte de traballo" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:77 -msgid "Show all reported hours" -msgstr "Mostrar todas as horas notificadas" - -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:21 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:22 msgid "NavalPlan: Subcontracted Tasks" msgstr "NavalPlan: Tarefas subcontratadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:984 +msgid "Efforts" +msgstr "Esforzos" + +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:41 +msgid "Show all reported hours" +msgstr "Mostrar todas as horas notificadas" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:102 msgid "Projects List" msgstr "Listado de proxectos" -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:51 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:50 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:48 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:74 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:52 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:45 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:79 -#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:45 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:136 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:57 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:74 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:49 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:60 -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:43 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:42 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:54 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:44 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:65 +#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:45 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:80 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:58 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:137 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43 msgid "Generate code" msgstr "Xerar código" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:109 -msgid "Scheduling state" -msgstr "Estado de planificación" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:368 -msgid "This template can not be removed because it has applications." -msgstr "Este modelo non pode borrarse porque ten aplicacións." - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:482 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:483 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." -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:27 -msgid "Select print page properties" -msgstr "Seleccione as propiedades da páxina de impresión" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:110 +msgid "Scheduling state" +msgstr "Estado de planificación" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:369 +msgid "This template can not be removed because it has applications." +msgstr "Este modelo non pode borrarse porque ten aplicacións." #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21 msgid "NavalPlan: Project Costs Per Resource" msgstr "NavalPlan: Custos de proxectos por recurso" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:205 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:206 msgid "criterion satisfaction's criterion not specified" msgstr "criterio do criterio satisfeito non especificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java:162 +#: navalplanner-webapp/src/main/java/org/navalplanner/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 " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:126 msgid "Scenarios must be enabled as more elements than master exist" msgstr "" "Os escenarios deben estar habilitados xa que existen máis elementos que " "master" -#: navalplanner-webapp/src/main/webapp/common/error.zul:35 -#: navalplanner-webapp/src/main/webapp/common/event_error.zul:29 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:50 +#: navalplanner-webapp/src/main/webapp/common/error.zul:54 msgid "Reload" msgstr "Recargar" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:557 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:613 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:558 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:614 msgid "Task {0} : Task group is incompatible type with {1}" msgstr "Tarefa {0} : O grupo de tarefas ten un tipo incompatible con {1}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:247 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:292 msgid "Virtual Workers Groups" msgstr "Grupos de traballadores virtuais" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:25 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:26 msgid "Profiles authorization" msgstr "Autorización de perfís" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:87 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:71 msgid "Assignation" msgstr "Asignación" @@ -5480,116 +5525,123 @@ msgstr "Asignación" msgid "Planning charts expanded" msgstr "Gráficas de planificación expandidas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:430 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:431 msgid "Not deletable" msgstr "Imborrable" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:165 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:189 msgid "Doing {0} reassignations" msgstr "Realizando {0} reasignacións" -#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:47 +#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:48 msgid "code not specified" msgstr "código non especificado" -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:21 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:22 msgid "Projects list" msgstr "Lista de proxectos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:189 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:190 msgid "" "Cannot delete work report type. There are some work reports bound to it." msgstr "" "Non se pode borrar o tipo de parte de traballo. Hai algún parte de traballo " "ligado a el." -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:22 msgid "Criterion Type List" msgstr "Lista de tipos de criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:599 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:737 msgid "Overall progress" msgstr "Progreso global" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:50 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:51 msgid "Create template from selected task" msgstr "Crear modelo a partir de tarefa seleccionada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:118 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:119 msgid "All projects" msgstr "Todos os proxectos" #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:47 -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:78 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:79 msgid "Password" msgstr "Contrasinal" -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:88 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:89 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:36 msgid "Observations" msgstr "Observacións" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:944 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:963 msgid "Edit project" msgstr "Editar proxecto" -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:26 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:23 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:24 msgid "Progress assignments" msgstr "Asignación de progreso" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:186 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:206 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:230 -#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:26 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:27 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:244 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:263 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:285 msgid "Valid from" msgstr "Válido desde" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:56 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:69 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:59 msgid "Month" msgstr "Mes" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:204 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:206 msgid "exception date already exists" msgstr "a data de excepción xa existe" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:303 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:308 msgid "There exists other template with the same name." msgstr "Xa existe outro modelo co mesmo nome." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:747 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:863 +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" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:758 msgid "Advanced assignment saved" msgstr "Asignación avanzada gardada" -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:54 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:30 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:55 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31 msgid "Color" msgstr "Cor" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:365 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:366 msgid "Cannot insert material in general view. Please, select a category" msgstr "" "Non se pode insertar material na vista xeral. Por favor, seleccione unha " "categoría" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:192 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:193 msgid "criterion satisfaction's start date not specified" msgstr "data de inicio do criterio satisfeito non especificada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:50 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:132 -#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:371 +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" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:51 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:83 #: navalplanner-webapp/src/main/webapp/planner/editTask.zul:79 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:65 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:82 -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:38 -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:42 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:68 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:131 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:166 -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:89 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:66 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:39 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:43 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:69 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:132 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:167 +#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:48 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:133 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:79 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:97 msgid "Accept" msgstr "Aceptar" @@ -5597,225 +5649,225 @@ msgstr "Aceptar" msgid "Example: {0}" msgstr "Exemplo: {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:279 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:299 -#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:39 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:283 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:303 +#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:40 msgid "Edit Worker" msgstr "Editar traballador" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:457 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:458 msgid "" "Create new material assignment out of material assignment {0}. Are you sure?" msgstr "" "Crear nova asignación de material fóra da asignación de material {0}. ¿Está " "seguro?" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:192 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:151 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:167 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:193 msgid "Work report lines" msgstr "Liñas do parte de traballo" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:48 msgid "Calculated" msgstr "Calculado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:117 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:118 msgid "Error setting up edition form for Criterion Type with id: {0}" msgstr "" "Erro preparando o formulario de edición para o tipo de criterio con id: {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:210 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:211 msgid "Completed: {0}% " msgstr "Completado: {0}% " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1177 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1178 msgid "Calculated progress measurement can not be removed" msgstr "As medidas de progreso calculadas non se poden borrar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:334 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:340 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:335 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:341 msgid " The " msgstr " O " -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:50 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:51 msgid "Access to the system" msgstr "Acceso ao sistema" -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:207 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:190 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:114 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:104 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:199 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160 -#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:44 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182 msgid "Click on " msgstr "Click en" -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:60 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:61 msgid "Probability" msgstr "Probabilidade" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:111 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:99 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:115 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:112 msgid "Report data" msgstr "Datos do informe" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:43 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:44 msgid "External load" msgstr "Carga externa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:202 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:204 msgid "Progress sent successfully" msgstr "O progreso enviouse con éxito" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:89 -msgid "Priority" -msgstr "Prioridade" - -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:36 -msgid "Landscape" -msgstr "Apaisado" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/InstanceNotFoundRecoverableErrorException.java:45 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/InstanceNotFoundRecoverableErrorException.java:46 msgid "instance not found" msgstr "instancia non atopada" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:424 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:73 +msgid "Priority" +msgstr "Prioridade" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:207 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:69 +msgid "Infinitely Over Assignable" +msgstr "Sobreasignable infinitamente" + +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:425 msgid "criterion names must be unique inside a criterion type" msgstr "o nome do criterio debe ser único dentro dun tipo de criterio" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:30 -msgid "Filters" -msgstr "Filtros" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:78 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:815 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:26 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:46 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:74 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:27 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:84 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:43 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:69 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:25 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:95 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:98 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:79 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:814 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:120 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:90 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:95 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:99 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:25 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:47 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:76 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:27 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:39 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:76 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:39 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:75 -#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:40 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:28 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:107 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:27 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:64 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:131 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:51 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:65 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:75 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:69 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:46 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:37 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:59 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:81 -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:35 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:36 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:49 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:144 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:232 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:36 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:59 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:186 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:287 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:26 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:85 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:66 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:76 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:49 +#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:40 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:114 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:76 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:26 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:52 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:65 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:132 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:37 msgid "Code" msgstr "Código" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:40 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:41 msgid "Add stretch" msgstr "Engadir tramo" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:86 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:70 msgid "Assignation type" msgstr "Tipo de asignación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:416 -msgid "Calculate Workable Days" -msgstr "Calcular días laborais" +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:33 +msgid "Show resource assignments" +msgstr "Mostrar asignacións de recursos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:213 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:240 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:241 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:214 msgid "" "Start date is not valid, the new start date must be lower than the end date" msgstr "" "A data de inicio non é válida, a data de inicio nova debe ser anterior á " "data de fin" -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:54 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:52 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:96 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:387 +msgid "Calculate Workable Days" +msgstr "Calcular días laborais" + #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:121 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:96 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:57 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:100 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:55 msgid "Start date" msgstr "Data de inicio" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:157 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:168 msgid "Update exception" msgstr "Actualizar excepción" +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:138 +msgid "Budget" +msgstr "Presuposto" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/TreeElementOperationsController.java:253 msgid "Operation cannot be done" msgstr "Non se pode realizar a operación" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:137 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 -msgid "Budget" -msgstr "Presuposto" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:329 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:330 msgid "Already exists other criterion with the same name" msgstr "Xa existe outro criterio co mesmo nome" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:75 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:65 msgid "May" msgstr "Maio" -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:36 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:37 msgid "Unit name" msgstr "Nome da unidade" -#: navalplanner-webapp/src/main/webapp/labels/labelTypes.zul:20 +#: navalplanner-webapp/src/main/webapp/labels/labelTypes.zul:21 msgid "NavalPlan: Labels" msgstr "NavalPlan: Etiquetas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:46 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:51 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java:44 -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:34 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:42 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:43 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48 msgid "Project code" msgstr "Código de proxecto" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:56 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:57 msgid "Write" msgstr "Escribir" -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:38 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:39 msgid "Number of applications" msgstr "Número de aplicacións" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:496 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:499 msgid "Assign element to queue automatically" msgstr "Asignar elemento á cola automáticamente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:81 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:82 msgid "" "Date which the task must start after (press enter in textbox to open " "calendar popup or type in date directly)" @@ -5823,22 +5875,22 @@ msgstr "" "Data despois da cal a tarefa debe empezar (presione enter no cadro de texto " "para abrir o calendario ou escriba a data directamente)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:295 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:529 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:42 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:326 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:604 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:43 msgid "Normal" msgstr "Normal" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:296 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:312 msgid "Date cannot be null" msgstr "A data non pode ser nula" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:766 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:68 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:765 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:49 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:168 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:70 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:126 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:68 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:76 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:142 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:169 msgid "Task Code" msgstr "Código da tarefa" @@ -5846,234 +5898,231 @@ msgstr "Código da tarefa" msgid "Project view" msgstr "Vista de proxecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:94 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:96 msgid "Create Profile" msgstr "Crear perfil" -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:50 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:52 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:54 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:51 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:53 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:55 msgid "Probability %" msgstr "Probabilidade %" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:746 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:747 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." -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:26 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:27 msgid "New criterion" msgstr "Criterio novo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:597 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:348 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:541 -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:48 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:349 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:735 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:542 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49 msgid "Load" msgstr "Carga" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:868 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:31 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:59 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:35 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:889 #: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:65 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:119 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:58 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:60 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:82 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:46 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:47 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:32 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:41 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:120 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:59 msgid "Description" msgstr "Descrición" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:71 -msgid "Expand all taskgroups" -msgstr "Expandir todos os grupos de tarefas" - -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:23 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:24 msgid "NavalPlan: Criteria" msgstr "NavalPlan: Criterios" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:164 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:117 msgid "Go to advanced Allocation" msgstr "Ir a asignación avanzada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:282 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:242 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:283 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:287 msgid "Project Templates" msgstr "Modelos de proxectos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:621 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:623 msgid "already exists an allocation for criteria {0}" msgstr "xa existe unha asignación para os criterios {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:307 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:309 msgid "Forward" msgstr "Adiante" -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:42 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:43 msgid "Number of finished applications" msgstr "Número de aplicacións finalizadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:464 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:465 msgid "Invalid queue element" msgstr "Elemento de cola inválido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:574 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:583 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:591 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:575 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:584 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:592 msgid "Unnasigned" msgstr "Non asignado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:402 -msgid "At least one HoursGroup is needed" -msgstr "É necesario alo menos un HoursGroup" - -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:69 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:61 -#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:156 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:70 msgid "User" msgstr "Usuario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:256 -msgid "Virtual worker" -msgstr "Traballador virtual" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403 +msgid "At least one HoursGroup is needed" +msgstr "É necesario alo menos un HoursGroup" #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:69 msgid "Interacts with applications" msgstr "Interactúa con aplicacións" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:330 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:257 +msgid "Virtual worker" +msgstr "Traballador virtual" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:343 msgid "Length percentage should be between 0 and 100" msgstr "A porcentaxe de duración debería estar entre 0 e 100" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:47 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:48 msgid "Multiple values per resource" msgstr "Múltiples valores por recurso" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:35 msgid "Hours:" msgstr "Horas:" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:57 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:63 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:62 msgid "Split" msgstr "Dividir" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:100 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:104 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:105 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:105 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:106 msgid "please, select a project" msgstr "por favor, seleccione un proxecto" -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:117 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:118 msgid "Supported Chrome, Firefox, Safari and Epiphany browsers" msgstr "Compatible cos navegadores Chrome, Firefox, Safari e Epiphany" -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:40 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:27 -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:32 -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:67 -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:24 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:42 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:93 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:33 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:68 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:41 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:50 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:29 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:94 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:45 msgid "Starting date" msgstr "Data de inicio" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:33 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:64 +msgid "Add materials" +msgstr "Engadir materiais" + +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:34 msgid "Load 100%" msgstr "Carga 100%" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:979 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:990 msgid "Function" msgstr "Función" -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:198 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:160 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:187 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:168 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:92 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:141 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:82 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:179 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:198 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:139 -#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:25 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:160 msgid "Format" msgstr "Formato" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:542 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:585 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:541 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:606 msgid "New project version" msgstr "Nova versión de proxecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:166 -msgid "Edit Unit Type" -msgstr "Editar tipo de unidade" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:473 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:81 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:530 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1231 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:471 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:306 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:34 -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:36 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:36 -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:24 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:47 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:46 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:41 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:26 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:32 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:39 -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:36 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:41 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:77 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:36 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:88 -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:23 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:46 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:24 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:47 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:43 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:332 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:77 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:474 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1250 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:472 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:532 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:44 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:37 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:42 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:37 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:33 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:24 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:47 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:48 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:104 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:37 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:78 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:25 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:39 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:35 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:25 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:49 msgid "Edit" msgstr "Editar" -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:35 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:174 +msgid "Edit Unit Type" +msgstr "Editar tipo de unidade" + #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 msgid "Init date" msgstr "Data de inicio" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:103 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:104 msgid "Responsible" msgstr "Responsable" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:456 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:457 msgid "percentage must be in range (0,100]" msgstr "a porcentaxe debe estar no rango (0,100]" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:52 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:61 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:44 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:53 msgid "New Description" msgstr "Nova descrición" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1136 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1154 msgid "" "resources cost category assignment codes must be unique inside a resource" msgstr "" "os códigos das asignacións de recursos a unha categoría de custo deben ser " "únicos dentro dun recurso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:159 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:162 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:160 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:164 msgid "XML" msgstr "XML" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:186 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:187 msgid "" "CriterionType is not valid, the criterionType overlap other " "criterionSatisfaction whith same criterionType" @@ -6081,102 +6130,95 @@ msgstr "" "CriterionType non válido, o criterionType solápase con outro " "criterionSatisfaction co mesmo criterionType" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:60 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:61 msgid "Unable to convert {0} value to {1} type" msgstr "Non se puido convertir o valor {0} ao tipo {1}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:197 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:198 msgid "Tree {0} sucessfully flattened" msgstr "Árobre {0} aplanada satisfatoriamente" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:110 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:31 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:83 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:30 msgid "Unit price" msgstr "Prezo da unidade" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:68 -msgid "Project Code" -msgstr "Código do proxecto" - -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46 msgid "Communication date" msgstr "Data de comunicación" -#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:29 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:68 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:72 +msgid "Project Code" +msgstr "Código do proxecto" + +#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:30 msgid "Reassigning" msgstr "Reasignando" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:519 +#: navalplanner-webapp/src/main/java/org/navalplanner/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." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:595 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:596 msgid "{0} already assigned to resource allocation list" msgstr "{0} xa está na lista de asignación de recursos" -#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:26 +#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:27 msgid "Unit Measure" msgstr "Unidade de medida" -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:21 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:22 msgid "Label Types List" msgstr "Lista de tipos de etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:414 -msgid "The type of hours cannot be null." -msgstr "O tipo de horas no pode ser nulo." - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:343 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:347 msgid "{0} projects reassignation remaining" msgstr "quedan {0} proxectos por reasignar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:51 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:52 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionBandboxFinder.java:44 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:50 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:48 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:46 -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:58 -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:35 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:24 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:41 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:26 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:51 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:148 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:117 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:157 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:137 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:178 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:99 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:140 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:95 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:125 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:165 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:107 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:148 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:77 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:46 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:152 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:41 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:41 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:63 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:127 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:42 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:196 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:42 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:46 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:98 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:232 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:25 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:36 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:33 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:48 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:42 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:64 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:128 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:59 msgid "Type" msgstr "Tipo" -#: navalplanner-webapp/src/main/webapp/planner/_contentOverallProgress.zul:59 -msgid "Refresh" -msgstr "Actualizar" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:631 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:637 msgid "" "This machine cannot be deleted because it has assignments to projects or " "imputed hours" @@ -6184,17 +6226,17 @@ msgstr "" "Esta máquina non se pode borrar porque ten asignacións a proxectos ou horas " "imputadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:81 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:71 msgid "November" msgstr "Novembro" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:121 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:122 msgid "BCWS" msgstr "BCWS" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1287 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1309 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1288 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1310 msgid "" "Value is not valid, the value must be greater than the value of the previous " "progress." @@ -6205,54 +6247,58 @@ msgstr "" msgid " in the specified directory." msgstr " no directorio especificado." -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1130 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1148 msgid "criterion satisfaction codes must be unique inside a resource" msgstr "o código do criterio debe ser único dentro dun recurso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:844 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:662 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:862 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:668 msgid "no" msgstr "non" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:359 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:360 msgid "missing code in a work report." msgstr "falta código nun parte de traballo." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:35 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:28 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:29 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:29 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:29 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:36 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:85 msgid "Criterion" msgstr "Criterio" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:94 +msgid "unl" +msgstr "ili" + #: navalplanner-webapp/src/main/webapp/common/configuration.zul:76 msgid "Generate code for" msgstr "Xerar código para" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/impl/LabelConverter.java:102 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:396 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:480 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/impl/LabelConverter.java:103 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:397 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:481 msgid "missing code in a label" msgstr "falta o código nunha etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:122 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:123 msgid "Actual Cost Work Performed" msgstr "Custo de traballo realizado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:182 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:184 msgid "Create project from Template" msgstr "Crear proxecto a partir de modelo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:265 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:310 msgid "NavalPlan Configuration" msgstr "NavalPlan: Configuración" -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:50 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:51 msgid "Average of the worked hours" msgstr "Media de horas traballadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:405 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:406 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" @@ -6262,16 +6308,16 @@ msgstr "" " O código non pode conter caracteres como '_' \n" " e non debe ser baleiro" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorization.java:42 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorization.java:43 msgid "an authorization type must be set" msgstr "Debe seleccionar un tipo de autorización" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:91 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:92 msgid "Must start after (days since beginning project)" msgstr "Debe empezar despois de (días desde o inicio do proxecto)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:541 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:584 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:540 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:605 msgid "" "Confirm creating a new project version for this scenario and derived. Are " "you sure?" @@ -6279,49 +6325,50 @@ msgstr "" "Confirmar a creación dunha nova versión do proxecto para este escenario e os " "seus derivados. ¿Está seguro?" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:149 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:77 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:113 -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:28 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:29 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:167 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:88 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:129 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:85 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:115 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:154 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:86 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:150 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:96 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:137 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:86 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:77 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:146 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:167 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:88 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:165 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:88 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:129 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:68 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:29 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:44 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:74 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:66 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:59 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166 msgid "Add" msgstr "Engadir" #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:124 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:73 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:85 msgid "Unselect" msgstr "Deseleccionar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:543 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:618 msgid "You should select the type of exception" msgstr "Debe seleccionar o tipo de excepción" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:92 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:45 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:98 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:93 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:56 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:30 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:51 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:99 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 msgid "Deadline" msgstr "data límite" @@ -6329,66 +6376,62 @@ msgstr "data límite" msgid "Filter by categories or materials" msgstr "Filtrar por categorías ou materiais" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:253 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:298 msgid "Subcontracted Tasks" msgstr "Tarefas subcontratadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:369 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:389 msgid "Amount work percentage should be between 0 and 100" msgstr "A porcentaxe de cantidade de traballo debe estar entre 0 y 100" -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:29 msgid "Machine data" msgstr "Datos da máquina" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:127 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:128 msgid "VAC" msgstr "VAC" -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:27 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:33 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:54 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:55 msgid "Label type" msgstr "Tipo de etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:228 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:298 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:242 -msgid "Advanced Allocation" -msgstr "Asignación avanzada" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:264 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:309 msgid "Administration / Management" msgstr "Administración / Xestión" -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:92 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:246 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:319 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:243 +msgid "Advanced Allocation" +msgstr "Asignación avanzada" + +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:93 msgid "Number of iterations" msgstr "Número de iteracións" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:59 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:60 msgid "Template Tree" msgstr "Árbore de modelos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:326 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:329 msgid "Criterion has subelements" msgstr "O criterio ten subelementos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:527 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:33 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:499 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:34 msgid "Alpha" msgstr "Alfa" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:162 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:203 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:163 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:204 msgid "inconsistent parent code." msgstr "código pai inconsistente." -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:67 -msgid "Recommended Allocation" -msgstr "Asignación recomendada" - #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:67 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:33 msgid "Status" msgstr "Estado" @@ -6396,61 +6439,59 @@ msgstr "Estado" msgid "Resource load view" msgstr "Vista de carga de recursos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:973 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:81 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:61 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:69 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:807 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:68 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:75 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:49 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:88 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:53 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:47 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:128 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:33 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:73 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:82 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:70 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:806 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:62 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:69 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:76 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:34 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:54 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:72 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:37 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:154 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:35 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:84 msgid "Hours" msgstr "Horas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:630 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:768 msgid "the date must be inside the visualization area" msgstr "a data debe estar dentro da área de visualización" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:404 -msgid "work report has not this label type assigned" -msgstr "o parte de traballo non ten este tipo de etiqueta asignado" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1220 -msgid "Limiting assignment" -msgstr "Asignación limitante" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:521 -msgid "date not specified." -msgstr "data non especificada." - -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:53 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:54 msgid "Quality form type" msgstr "Tipo de formulario de calidade" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:343 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:405 +msgid "work report has not this label type assigned" +msgstr "o parte de traballo non ten este tipo de etiqueta asignado" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1229 +msgid "Limiting assignment" +msgstr "Asignación limitante" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:522 +msgid "date not specified." +msgstr "data non especificada." + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:344 msgid "The name of the criterion is empty." msgstr "O nome do criterio está baleiro." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:359 -msgid " hours" -msgstr " horas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:133 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:146 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:241 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:147 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:281 msgid "Limiting Resources Planning" msgstr "Planificación de recursos limitantes" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:769 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:360 +msgid " hours" +msgstr " horas" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:770 msgid "The max value must be not empty" msgstr "O valor máximo non pode ser baleiro" @@ -6458,38 +6499,34 @@ msgstr "O valor máximo non pode ser baleiro" msgid "New label" msgstr "Nova etiqueta" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:133 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:134 msgid "Worker ID cannot be empty" msgstr "NIF do traballador non especificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:342 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:351 -msgid "The start date cannot be null" -msgstr "A data de inicio non pode ser nula" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:176 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:177 msgid "All project tasks" msgstr "Todas as tarefas do proxecto" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:77 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:72 -msgid "Allocation configuration" -msgstr "Configuración de asignación" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:352 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:343 +msgid "The start date cannot be null" +msgstr "A data de inicio non pode ser nula" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:124 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:125 msgid "Scenario \"{0}\" saved" msgstr "Escenario \"{0}\" gardado" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:214 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:173 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:27 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:78 +msgid "Allocation configuration" +msgstr "Configuración de asignación" + +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:189 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:215 msgid "Save & New work report" msgstr "Gardar e novo parte de traballo" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:51 -msgid "Subcontract price" -msgstr "Prezo de subcontratación" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:147 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:148 msgid "" "Some entity sequence was created during the configuration process, it is " "impossible to update entity sequence table. Please, try again later" @@ -6498,624 +6535,184 @@ msgstr "" "imposible actualizar a táboa de secuencia de entidade. Por favor, volva " "intentalo máis tarde" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:584 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:52 +msgid "Subcontract price" +msgstr "Prezo de subcontratación" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:739 msgid "Resources per day are zero" msgstr "Hai cero recursos por día" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:30 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:23 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:30 msgid "Assigned criteria" msgstr "Criterios asignados" -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:52 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:53 msgid "Help on authentication (opens a new window)" msgstr "Axuda sobre a identificación (abre unha ventana nova)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:869 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/EffortDurationBox.java:39 +msgid "Not a valid effort duration" +msgstr "Non é unha duración de esforzo válida" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:870 msgid "The length must be greater than 0, and not null." msgstr "A lonxitude debe ser maior que cero e non nula." -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:65 -msgid "2011" -msgstr "2011" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:504 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:536 msgid "Could not save new calendar" msgstr "Non se puido gardar o calendario novo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1384 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1404 msgid "Sigmoid function applied to current resource" msgstr "Función sigmoide aplicada ao recurso actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:152 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:160 msgid "Deleted unit type {0}" msgstr "Borrado tipo de unidade {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:224 msgid "Could not save the scenario" msgstr "Non se puido gardar o escenario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:135 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:136 msgid "Couldn't find criterion {0}" msgstr "Non se puido atopar o criterio {0}" -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:32 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:36 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:37 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:33 +#: navalplanner-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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:293 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:338 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41 msgid "Task Scheduling Status In Project" msgstr "Estado de planificación de tarefas en proxecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:322 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:355 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:175 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:199 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:344 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:372 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:421 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:194 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:345 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:373 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:356 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:888 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:200 msgid "Confirm" msgstr "Confirmar" -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:48 -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:44 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:47 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:32 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:42 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:50 -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:48 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:54 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:55 -#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:31 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:57 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:59 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:56 -#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:31 -#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:31 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:57 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:48 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:55 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:43 +#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:32 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:58 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:32 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:32 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:56 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:33 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:47 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:49 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:61 msgid "Create" msgstr "Crear" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1705 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1711 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1728 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1734 msgid "please, select a work report type" msgstr "por favor, seleccione un tipo de parte de traballo" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:43 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67 msgid "Permissions" msgstr "Permisos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:485 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:486 msgid "List of materials for category: {0}" msgstr "Lista de materiais para a categoría: {0}" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:32 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:31 msgid "Total price" msgstr "Prezo total" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:947 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:953 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:381 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:711 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:179 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:137 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:321 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:800 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:619 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:231 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:293 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:461 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:475 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:142 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:162 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1247 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1203 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:199 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:331 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:404 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:387 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1207 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1219 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:435 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:203 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:270 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:291 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:125 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:711 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:971 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1220 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:377 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:90 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:120 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:39 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:66 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:41 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:90 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:54 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:52 -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:87 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:51 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:89 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:68 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:116 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:131 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:44 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:106 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:147 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:188 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:109 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:150 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:135 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:175 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:107 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:232 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:126 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:362 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:530 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:544 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:163 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:818 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:625 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:138 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:324 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:948 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:954 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:271 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:292 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:787 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1045 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1296 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:419 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:408 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:694 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1266 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:388 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:332 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:405 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1204 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1230 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1242 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:436 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:223 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:117 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:158 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:127 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:106 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:147 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:188 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:110 -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:41 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:46 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:90 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:101 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:78 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:66 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:60 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:83 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:42 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:109 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:150 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:49 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:92 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:46 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:88 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:69 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:117 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:132 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:104 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:114 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:51 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:52 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:48 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:115 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:53 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:59 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:213 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:84 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:40 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:90 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:120 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:66 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:54 msgid "Delete" msgstr "Borrar" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:98 -msgid "There are no days available due to not satisfying the criterions." -msgstr "Non hai días dispoñibles por non satisfacer os criterios." - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:99 -msgid "" -"Another possibility is that the resources don't have days available due to " -"their calendars." -msgstr "" -"Outra posibilidade é que os recursos non teñan días dispoñibles debido aos " -"seus calendarios." - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:105 -msgid "" -"There are no days available in the days marked available by the task " -"calendar." -msgstr "" -"Non han días dispoñibles nos días marcados dispoñibles polo calendario da " -"tarefa." - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:106 -msgid "Maybe the criterions are not satisfied in those days." -msgstr "Quizais os criterios non se satisfán neses días." - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:170 -msgid "" -"The resource's calendar has no available days starting from the start of the " -"task." -msgstr "" -"O calendario do recuso non ten días dispoñibles comezando desde o inicio da " -"tarefa." - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:175 -msgid "" -"There are no days available at resource's calendar in the days marked " -"available by the task's calendar." -msgstr "" -"Non hai días dispoñibles no calendario do recurso nos días marcados " -"dispoñibles polo calendario da tarefa." - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:27 -msgid "Finished" -msgstr "Rematado" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:28 -msgid "In progress" -msgstr "En progreso" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:29 -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31 -msgid "Pending" -msgstr "Pendente" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:30 -msgid "Blocked" -msgstr "Bloqueado" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31 -msgid "Failed sent" -msgstr "Fallo no envío" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:32 -msgid "Success sent" -msgstr "Éxito no envío" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AssignmentFunction.java:57 -msgid "None" -msgstr "Ningún" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AssignmentFunction.java:58 -msgid "Stretches" -msgstr "Tramos" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AssignmentFunction.java:59 -msgid "Interporlation" -msgstr "Interpolación" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AssignmentFunction.java:60 -msgid "Sigmoid" -msgstr "Sigmoide" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueDependency.java:169 -msgid "A queue dependency has to have an origin different from destiny" -msgstr "A dependencia de cola debe ter unha orixe diferente do destino" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/QueuePosition.java:52 -msgid "Hour should be a value between 0 and 23" -msgstr "A hora debe ser un valor entre 0 e 23" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:33 -msgid "Web service reader" -msgstr "Lectura de servizos web" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:34 -msgid "Web service writer" -msgstr "Escritura de servizos web" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:35 -msgid "All projects read allowed" -msgstr "Permitida lectura de todos os proxectos" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:36 -msgid "All projects edition allowed" -msgstr "Permitida edición de todos os proxectos" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:37 -msgid "Project creation allowed" -msgstr "Permitida creación de proxectos" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:32 -msgid "Read authorization" -msgstr "Autorización de lectura" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:33 -msgid "Write authorization" -msgstr "Autorización de escritura" - -#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java:121 -msgid "Line" -msgstr "Liña" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:34 -msgid "WORK_RELATIONSHIP" -msgstr "RELACIÓN_LABORAL" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:40 -msgid "LOCATION_GROUP" -msgstr "GRUPO_LOCALIZACIÓN" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:47 -msgid "MACHINE LOCATION_GROUP" -msgstr "GRUPO_LOCALIZACIÓN MÁQUINAS" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:55 -msgid "LEAVE" -msgstr "BAIXA" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:61 -msgid "TRAINING" -msgstr "FORMACIÓN" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:67 -msgid "JOB" -msgstr "POSTO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:73 -msgid "CATEGORY" -msgstr "CATEGORÍA" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:31 -msgid "WORKER" -msgstr "TRABALLADOR" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:32 -msgid "MACHINE" -msgstr "MÁQUINA" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:161 -msgid "[generic all machines]" -msgstr "[xenérico todas as máquinas]" - -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:106 -msgid "Hours cost type cannot be empty or null" -msgstr "O custo das horas non pode ser baleiro ou nulo" - -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:115 -msgid "Init date cannot be empty or null" -msgstr "A data de inicio non pode ser baleira ou nula" - -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:120 -msgid "End date cannot be empty or null" -msgstr "A data de fin non pode ser baleira ou nula" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ProgressType.java:35 -msgid "Progress with all task tasks by hours" -msgstr "Avance con tódalas tarefas por horas" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ProgressType.java:36 -msgid "Progress with critical path tasks by hours" -msgstr "Avance con tarefas do camiño crítico por horas" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ProgressType.java:37 -msgid "Progress with critical path tasks by duration" -msgstr "Avance con tarefas do camiño crítico por duración" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/EntitySequence.java:89 -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/EntitySequence.java:130 -msgid "You can not modifiy this order sequence, it is already in use" -msgstr "Non se pode modificar esta secuencia de proxecto, está a ser usada" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/EntitySequence.java:139 -#, java-format -msgid "number of digits must be between {0} and {1}" -msgstr "o número de díxitos debe estar entre {0} e{1}" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/daos/EntitySequenceDAO.java:81 -msgid "You can not remove this order sequence, it is already in use" -msgstr "Non se pode borrar esta secuencia de proxecto, está a ser usada" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java:893 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:653 -msgid "Cannot spread two progress in the same task" -msgstr "Non pode haber dous tipos de progreso que propagan na mesma tarefa" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:168 -#, java-format -msgid "{0} is already child of another {1}" -msgstr "{0} xa é fillo doutro {1}" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:214 -msgid "it's already somewhat scheduled" -msgstr "xa está planificado dalgún xeito" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:228 -msgid "it can't be unscheduled" -msgstr "non se pode quitar a planificación" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:366 -msgid "Completely scheduled" -msgstr "Completamente planificado" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:368 -msgid "Partially scheduled" -msgstr "Parcialmente planificado" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:370 -msgid "Unscheduled" -msgstr "Non planificado" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:376 -msgid "C" -msgstr "C" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:378 -msgid "P" -msgstr "P" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:380 -msgid "U" -msgstr "N" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 -msgid "OFFERED" -msgstr "OFERTADO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 -msgid "ACCEPTED" -msgstr "ACEPTADO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 -msgid "STARTED" -msgstr "EMPEZADO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 -msgid "FINISHED" -msgstr "REMATADO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 -msgid "CANCELLED" -msgstr "CANCELADO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 -msgid "SUBCONTRACTED PENDING PROJECT" -msgstr "PROXECTO PENDENTE SUBCONTRATADO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 -msgid "STORED" -msgstr "ALMACENADO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:574 -msgid "" -"Some ancestor has the same label assigned, so this element is already " -"inheriting this label" -msgstr "" -"Algún antecesor ten a mesma etiqueta asignada, así que este elemento xa está " -"herdando esa etiqueta" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:677 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:703 -msgid "Duplicate Progress Assignment For Task" -msgstr "Asignación de progreso duplicada para a tarefa" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:1336 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:1346 -#, java-format -msgid "Repeated Project code {0} in Project {1}" -msgstr "Código de proxecto {0} repetido no proxecto {1}" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:259 -msgid "workHours should be greater or equals to 0" -msgstr "As horas de traballo deben ser maiores o iguais a cero" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:271 -msgid "" -"\"workHours\" value is not valid, taking into account the current list of " -"HoursGroup" -msgstr "" -"O valor de horas de traballo non é válido, tendo en conta a lista actual de " -"grupos de horas" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:180 -msgid "Working hours shouldn't be negative" -msgstr "As horas de traballo non poden ser negativas" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:209 -msgid "Total percentage should be less than 100%" -msgstr "A porcentaxe total debe ser menor que 100%" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:258 -#, java-format -msgid "" -" The criterion {0} can not be assigned to this hoursGroup because its " -"resource type is diferent." -msgstr "" -" O criterio {0} non se pode asignar a este grupo de horas porque o seu tipo " -"de recurso é distinto." - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:264 -#, java-format -msgid "" -" The criterion {0} can not be assigned to this hoursGroup because it " -"already exist into the hoursGroup." -msgstr "" -" O criterio {0} non se pode asignar a este grupo de horas porque xa existe " -"no grupo." - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:420 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:430 -#, java-format -msgid "Repeated Hours Group code {0} in Project {1}" -msgstr "Código de grupo de horas {0} repetido no proxecto {1}" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java:539 -#, java-format -msgid " The {0} already exist into other task" -msgstr " O {0} xa existe noutra tarefa" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:30 -msgid "Number of assigned hours" -msgstr "Número de horas asignadas" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:31 -msgid "Number of hours calculated by clock" -msgstr "Número de horas calculadas en base a reloxo" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:32 -msgid "Number of assigned hours and the time" -msgstr "Número de horas asignadas e hora" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:33 -msgid "heading" -msgstr "cabeceira" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:33 -msgid "line" -msgstr "liña" - -#: navalplanner-business/src/main/java/org/navalplanner/business/scenarios/entities/Scenario.java:175 -#, java-format -msgid "Derived from {0}" -msgstr "Derivado de {0}" - -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:31 -msgid "RECEIVED" -msgstr "RECIBIDO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:32 -msgid "PENDING" -msgstr "PENDENTE" - -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:33 -msgid "ORDERED" -msgstr "proxecto" - -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:34 -msgid "PROCESSING" -msgstr "PROCESANDO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:35 -msgid "CANCELED" -msgstr "CANCELADO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/QualityFormType.java:28 -msgid "by percentage" -msgstr "por porcentaxe" - -#: navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/QualityFormType.java:28 -msgid "by items" -msgstr "por ítems" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java:119 -msgid "Yes" -msgstr "Si" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java:119 -msgid "No" -msgstr "Non" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java:81 -msgid "Monday" -msgstr "Luns" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java:81 -msgid "Tuesday" -msgstr "Martes" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java:81 -msgid "Wednesday" -msgstr "Mércores" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java:82 -msgid "Thursday" -msgstr "Xoves" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java:82 -msgid "Friday" -msgstr "Venres" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java:82 -msgid "Saturday" -msgstr "Sábado" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java:83 -msgid "Sunday" -msgstr "Domingo" - -#~ msgid "" -#~ "Still not saved changes would be lost. Are you sure you want to go to " -#~ "create a template?" -#~ msgstr "" -#~ "Os cambios que non foron gardados perderanse. ¿Está seguro de que quere " -#~ "ir á creación de modelos?" - -#~ msgid "" -#~ "Templates can only be created from already existent tasks.\n" -#~ "Newly tasks cannot be used." -#~ msgstr "" -#~ "Os modelos só poden crearse a partir de tarefas existentes.\n" -#~ "Non se poden usar tarefas novas." - -#~ msgid "Choose a task to operate on it" -#~ msgstr "Seleccione unha tarefa para operar sobre ela"