From 8b883f701cf2c4fdc598a1ab05f29c42fe718ddd Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Wed, 11 Apr 2012 12:31:45 +0200 Subject: [PATCH] i18n: Update Spanish and Galician translations FEA: ItEr76S03Community --- ganttzk/src/main/resources/i18n/es.po | 56 +- ganttzk/src/main/resources/i18n/gl.po | 58 +- .../src/main/resources/i18n/es.po | 567 ++++++++++-------- .../src/main/resources/i18n/gl.po | 567 ++++++++++-------- 4 files changed, 691 insertions(+), 557 deletions(-) diff --git a/ganttzk/src/main/resources/i18n/es.po b/ganttzk/src/main/resources/i18n/es.po index 3573626b7..038e570f1 100644 --- a/ganttzk/src/main/resources/i18n/es.po +++ b/ganttzk/src/main/resources/i18n/es.po @@ -10,10 +10,10 @@ # Manuel Rego Casasnovas , 2010, 2011, 2012. msgid "" msgstr "" -"Project-Id-Version: 1.2.1\n" +"Project-Id-Version: libreplan-1.2.3\n" "Report-Msgid-Bugs-To: http://bugs.libreplan.org/\n" -"POT-Creation-Date: 2012-01-13 16:49+0100\n" -"PO-Revision-Date: 2012-01-13 16:00+0000\n" +"POT-Creation-Date: 2012-04-11 08:32+0200\n" +"PO-Revision-Date: 2012-04-11 08:35+0000\n" "Last-Translator: Manuel Rego Casasnovas \n" "Language-Team: Español\n" "MIME-Version: 1.0\n" @@ -22,12 +22,12 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:215 -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:234 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:216 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:235 msgid "Erase" msgstr "Borrar" -#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:300 +#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:299 msgid "Add Dependency" msgstr "Añadir dependencia" @@ -35,11 +35,15 @@ msgstr "Añadir dependencia" msgid "Worker" msgstr "Trabajador" +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:682 +msgid "Show money cost bar" +msgstr "Mostrar barra de coste monetario" + #: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:29 msgid "Start" msgstr "Inicio" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:635 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:661 msgid "Show reported hours" msgstr "Mostrar horas reportadas" @@ -64,7 +68,7 @@ msgstr "Recursos limitantes" msgid "The specified dependency is not allowed" msgstr "La dependencia especificada no está permitida" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:254 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:255 msgid "Set End-End" msgstr "Definir Fin-Fin" @@ -88,6 +92,10 @@ msgstr "esfuerzo disponible: {0}, esfuerzo asignado: {1}" msgid "Criterion" msgstr "Criterio" +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:688 +msgid "Hide money cost bar" +msgstr "Ocultar barra de coste monetario" + #: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:44 msgid "Print" msgstr "Imprimir" @@ -116,6 +124,10 @@ msgstr "Fin" msgid "changing zoom" msgstr "cambiando zoom" +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:91 +msgid "Show/Hide money cost bar" +msgstr "Mostrar/Ocultar barra de coste monetario" + #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:45 msgid "Quarter" msgstr "Trimestre" @@ -141,7 +153,7 @@ msgstr "Nombre" msgid "Name filter" msgstr "Filtro por nombres" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:615 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:641 msgid "Show progress" msgstr "Mostrar progreso" @@ -153,14 +165,14 @@ msgstr "Expandir/Plegar todo" msgid "Show/Hide critical path" msgstr "Mostrar/Ocultar camino crítico" -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:32 -msgid "Year" -msgstr "Año" - #: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:150 msgid "showing criteria" msgstr "mostrando criterios" +#: 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:58 msgid "Month" msgstr "Mes" @@ -169,15 +181,15 @@ msgstr "Mes" msgid "Show/Hide resources" msgstr "Mostrar/Ocultar recursos" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:246 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:247 msgid "Set End-Start" msgstr "Definir Fin-Inicio" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:297 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:308 msgid "decreasing zoom" msgstr "reduciendo zoom" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:596 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:622 msgid "Hide critical path" msgstr "Ocultar camino crítico" @@ -185,7 +197,7 @@ msgstr "Ocultar camino crítico" msgid "Day" msgstr "Día" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:642 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:668 msgid "Hide reported hours" msgstr "Ocultar horas reportadas" @@ -206,11 +218,11 @@ msgid "Hour" msgstr "Hora" #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:90 -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:114 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:120 msgid "Graphics" msgstr "Gráficas" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:250 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:251 msgid "Set Start-Start" msgstr "Definir Inicio-Inicio" @@ -218,7 +230,7 @@ msgstr "Definir Inicio-Inicio" msgid "See resource allocation" msgstr "Ver asignación de recursos" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:280 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:291 msgid "increasing zoom" msgstr "aumentando zoom" @@ -234,10 +246,10 @@ msgstr "Todos" msgid "Refresh" msgstr "Actualizar" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:591 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:617 msgid "Show critical path" msgstr "Mostrar camino crítico" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:620 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:646 msgid "Hide progress" msgstr "Ocultar progreso" diff --git a/ganttzk/src/main/resources/i18n/gl.po b/ganttzk/src/main/resources/i18n/gl.po index 1f90df997..57515165c 100644 --- a/ganttzk/src/main/resources/i18n/gl.po +++ b/ganttzk/src/main/resources/i18n/gl.po @@ -10,11 +10,11 @@ # Manuel Rego Casasnovas , 2010, 2011, 2012. msgid "" msgstr "" -"Project-Id-Version: 1.2.1\n" +"Project-Id-Version: libreplan-1.2.3\n" "Report-Msgid-Bugs-To: http://bugs.libreplan.org/\n" -"POT-Creation-Date: 2012-01-13 16:49+0100\n" -"PO-Revision-Date: 2012-01-13 16:01+0000\n" -"Last-Translator: Manuel Rego Casasnovas\n" +"POT-Creation-Date: 2012-04-11 08:32+0200\n" +"PO-Revision-Date: 2012-04-11 08:34+0000\n" +"Last-Translator: Manuel Rego Casasnovas \n" "Language-Team: Galego\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,12 +22,12 @@ msgstr "" "Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:215 -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:234 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:216 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:235 msgid "Erase" msgstr "Borrar" -#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:300 +#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:299 msgid "Add Dependency" msgstr "Engadir dependencia" @@ -35,11 +35,15 @@ msgstr "Engadir dependencia" msgid "Worker" msgstr "Traballador" +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:682 +msgid "Show money cost bar" +msgstr "Mostrar barra de coste monetario" + #: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:29 msgid "Start" msgstr "Inicio" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:635 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:661 msgid "Show reported hours" msgstr "Mostrar horas reportadas" @@ -64,7 +68,7 @@ msgstr "Recursos limitantes" msgid "The specified dependency is not allowed" msgstr "A dependencia especificada non está permitida" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:254 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:255 msgid "Set End-End" msgstr "Definir Fin-Fin" @@ -88,6 +92,10 @@ msgstr "esforzo dispoñible: {0}, esforzo asignado: {1}" msgid "Criterion" msgstr "Criterio" +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:688 +msgid "Hide money cost bar" +msgstr "Ocultar barra de coste monetario" + #: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:44 msgid "Print" msgstr "Imprimir" @@ -116,6 +124,10 @@ msgstr "Fin" msgid "changing zoom" msgstr "cambiando zoom" +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:91 +msgid "Show/Hide money cost bar" +msgstr "Mostrar/Ocultar barra de coste monetario" + #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:45 msgid "Quarter" msgstr "Trimestre" @@ -141,7 +153,7 @@ msgstr "Nome" msgid "Name filter" msgstr "Filtro por nomes" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:615 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:641 msgid "Show progress" msgstr "Mostrar progreso" @@ -153,14 +165,14 @@ msgstr "Expandir/Pregar todo" msgid "Show/Hide critical path" msgstr "Mostrar/Ocultar camiño crítico" -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:32 -msgid "Year" -msgstr "Ano" - #: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:150 msgid "showing criteria" msgstr "mostrando criterios" +#: 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:58 msgid "Month" msgstr "Mes" @@ -169,15 +181,15 @@ msgstr "Mes" msgid "Show/Hide resources" msgstr "Mostrar/Ocultar recursos" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:246 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:247 msgid "Set End-Start" msgstr "Definir Fin-Inicio" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:297 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:308 msgid "decreasing zoom" msgstr "reducindo zoom" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:596 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:622 msgid "Hide critical path" msgstr "Ocultar camiño crítico" @@ -185,7 +197,7 @@ msgstr "Ocultar camiño crítico" msgid "Day" msgstr "Día" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:642 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:668 msgid "Hide reported hours" msgstr "Ocultar horas reportadas" @@ -206,11 +218,11 @@ msgid "Hour" msgstr "Hora" #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:90 -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:114 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:120 msgid "Graphics" msgstr "Gráficas" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:250 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:251 msgid "Set Start-Start" msgstr "Definir Inicio-Inicio" @@ -218,7 +230,7 @@ msgstr "Definir Inicio-Inicio" msgid "See resource allocation" msgstr "Ver asignación de recursoss" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:280 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:291 msgid "increasing zoom" msgstr "aumentando zoom" @@ -234,10 +246,10 @@ msgstr "Todos" msgid "Refresh" msgstr "Actualizar" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:591 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:617 msgid "Show critical path" msgstr "Mostrar camiño crítico" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:620 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:646 msgid "Hide progress" msgstr "Ocultar progreso" diff --git a/libreplan-webapp/src/main/resources/i18n/es.po b/libreplan-webapp/src/main/resources/i18n/es.po index e41fc6772..5eba0560d 100644 --- a/libreplan-webapp/src/main/resources/i18n/es.po +++ b/libreplan-webapp/src/main/resources/i18n/es.po @@ -10,10 +10,10 @@ # Manuel Rego Casasnovas , 2010, 2011, 2012. msgid "" msgstr "" -"Project-Id-Version: 1.2.2\n" +"Project-Id-Version: libreplan-1.2.3\n" "Report-Msgid-Bugs-To: http://bugs.libreplan.org/\n" -"POT-Creation-Date: 2012-02-24 09:08+0100\n" -"PO-Revision-Date: 2012-02-24 10:05+0000\n" +"POT-Creation-Date: 2012-04-11 08:32+0200\n" +"PO-Revision-Date: 2012-04-11 08:35+0000\n" "Last-Translator: Manuel Rego Casasnovas \n" "Language-Team: Español\n" "MIME-Version: 1.0\n" @@ -152,7 +152,7 @@ msgstr "No puede estar vacío" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 #: libreplan-webapp/src/main/webapp/materials/materials.zul:33 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:66 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:67 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:54 @@ -161,7 +161,7 @@ msgstr "No puede estar vacío" msgid "Materials" msgstr "Materiales" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:361 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:357 msgid "Reassign" msgstr "Reasignar" @@ -202,7 +202,7 @@ msgstr "Predefinido" #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:344 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:67 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:68 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53 msgid "Quality Forms" msgstr "Formularios de calidad" @@ -211,11 +211,15 @@ msgstr "Formularios de calidad" msgid "Reports" msgstr "Informes" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:117 +msgid "Create task" +msgstr "Crear tarea" + #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:22 msgid "LibrePlan: Advanced allocation" msgstr "LibrePlan: Asignación avanzada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:172 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:177 msgid "The {0} sequence prefixes can not be repeated" msgstr "Los prefijos de secuencia de {0} no pueden repetirse" @@ -302,7 +306,7 @@ msgid "generic workers allocation" msgstr "asignación genérica de trabajadores" #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:310 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:895 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 msgid "The project has no scheduled elements" msgstr "El proyecto no tiene elementos planificados" @@ -380,19 +384,19 @@ msgstr "Haz click en este" msgid "Project Name" msgstr "Nombre del proyecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:967 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1084 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306 msgid "Indent" msgstr "Indentar" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:252 +msgid "Reassignation" +msgstr "Reasignación" + #: libreplan-webapp/src/main/webapp/common/configuration.zul:327 msgid "Save passwords in database" msgstr "Guardar contraseñas en la base de datos" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:256 -msgid "Reassignation" -msgstr "Reasignación" - #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:42 msgid "New template" msgstr "Plantilla nueva" @@ -461,7 +465,7 @@ msgid "" "applicable to this resource" msgstr "existen criterios satisfechos que pertenecen a tipos de criterio no aplicables a este recurso" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:65 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:66 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:52 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:50 msgid "Criterion Requirement" @@ -596,7 +600,7 @@ msgstr "Octubre" msgid "First name" msgstr "Nombre" -#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java:256 +#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java:250 msgid "Could not execute print command" msgstr "No se pudo ejecutar el comando de impresión" @@ -609,7 +613,7 @@ msgstr "Campos de texto complementario" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:452 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:832 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:836 msgid "Confirm deleting {0}. Are you sure?" msgstr "Confirmar el borrado de {0}. ¿Está seguro?" @@ -736,7 +740,7 @@ msgstr "Este proyecto ya ha sido añadido." msgid "The task code cannot be null" msgstr "El código de la tarea no puede ser nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:594 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:596 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:329 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 @@ -813,7 +817,7 @@ msgstr "Junio" msgid "{0} annotation required on {1}" msgstr "{0} anotación obligatoria en {1}" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1067 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1193 msgid "Modified" msgstr "Modificado" @@ -878,7 +882,7 @@ msgstr "El progreso calculado no se puede modificar" msgid "Work done from starting date" msgstr "Trabajo realizado desde la fecha de inicio" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:69 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:70 msgid "Statistics log" msgstr "Histórico de estadísticas" @@ -887,7 +891,7 @@ msgstr "Histórico de estadísticas" msgid "Edit Calendar" msgstr "Editar calendario" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:112 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:117 msgid "Profile" msgstr "Perfil" @@ -910,7 +914,7 @@ msgstr "No puede ser vacío o nulo" msgid "{0} \"{1}\" saved" msgstr "{0} \"{1}\" guardado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:299 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:301 msgid "filtering" msgstr "filtrado" @@ -967,6 +971,12 @@ msgstr "Este criterio ya ha sido añadido." msgid "add" msgstr "añadir" +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:860 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:111 +#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:69 +msgid "Budget value cannot be negative" +msgstr "El valor del presupuesto no puede ser negativo" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:239 msgid "Unsaved changes will be lost. Would you like to continue?" msgstr "Se perderán los cambios sin guardar. ¿Le gustaría continuar?" @@ -1044,8 +1054,8 @@ msgstr "Añadir rol" msgid "Exception end date should be greater or equals than start date" msgstr "La fecha de fin de una excepción debe ser mayor o igual que la fecha de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:476 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:486 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:474 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:484 msgid "Repeated Project code {0} in Project {1}" msgstr "Código {0} de proyecto repetdio en proyecto {1}" @@ -1075,7 +1085,7 @@ msgstr "Fecha de inicio más temprana" msgid "Type data" msgstr "Datos del tipo" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:117 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:122 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 msgid "Profiles" msgstr "Perfiles" @@ -1221,13 +1231,13 @@ msgstr "Lista de Perfiles" msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "{0} de la categoría {1} y {2} de la categoría {3} tienen el mismo código" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:958 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:236 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:690 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:581 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1039 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:240 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:696 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:583 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:68 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:64 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:65 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:50 msgid "Labels" @@ -1237,7 +1247,7 @@ msgstr "Etiquetas" msgid "Data Types" msgstr "Tipos de datos" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:157 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:161 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68 msgid "Total hours" msgstr "Total de horas" @@ -1254,8 +1264,8 @@ msgstr "Reasignando {0} proyectos" msgid "Filter by task status" msgstr "Filtrar por estado de tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:528 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:419 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:529 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:416 msgid "Select date" msgstr "Seleccione fecha" @@ -1272,19 +1282,23 @@ msgstr "Por favor, inténtelo de nuevo." msgid "Company code" msgstr "Código de la empresa" +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:62 +msgid "Sum of imputed hours in children tasks" +msgstr "Suma de horas imputadas en las tareas hijas" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/TwoWaySelector.java:110 msgid "Unknown attribute '{0}' in class {1}" msgstr "Atributo desconocido '{0}' en la clase {1}" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:96 +msgid "passwords can not be empty" +msgstr "las conraseñas no pueden estar vacías" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:699 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:33 msgid "NON LIMITING RESOURCE" msgstr "RECURSO NO LIMITANTE" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:96 -msgid "passwords can not be empty" -msgstr "las conraseñas no pueden estar vacías" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:88 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:128 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:176 @@ -1433,11 +1447,15 @@ msgstr "Lista de tramos" msgid "Enable scenarios module" msgstr "Habilitar módulo de escenarios" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:312 +msgid "to {0}" +msgstr "hasta {0}" + #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:59 msgid "Zoom" msgstr "Zoom" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:865 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:863 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112 #: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91 @@ -1453,9 +1471,9 @@ msgstr "Zoom" #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:131 #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:81 #: libreplan-webapp/src/main/webapp/settings/settings.zul:124 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:81 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:162 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:135 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:70 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:151 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:143 #: libreplan-webapp/src/main/webapp/calendars/calendars.zul:44 #: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:40 #: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:41 @@ -1514,7 +1532,7 @@ msgstr "Problemas conectando con el servicio web subcontratista" msgid "Entity type" msgstr "Tipo de entidad" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1101 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1127 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:268 msgid "Unsaved changes will be lost. Are you sure?" msgstr "Se perderán los cambios sin guardar. ¿Está seguro?" @@ -1555,13 +1573,13 @@ msgstr "Recursos por día" msgid "ResourceType must be not-null" msgstr "El tipo de recurso no puede ser nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:95 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:105 msgid "" "Estimated end date for the task (press enter in textbox to open calendar " "popup or type in date directly)" msgstr "Fecha de fin estimada para la tarea (presione enter en el cuadro de texto para abrir el calendario o escriba la fecha directamente)" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:292 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:293 msgid "Expand/Collapse all" msgstr "Expandir/Plegar todo" @@ -1569,11 +1587,11 @@ msgstr "Expandir/Plegar todo" msgid "Overload due to current project" msgstr "Sobrecarga debido al proyecto actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:946 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1017 msgid "Name: {0}" msgstr "Nombre: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:903 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1020 msgid "Move down" msgstr "Mover abajo" @@ -1620,7 +1638,7 @@ msgstr "Asignar" msgid "missing code in a criterion" msgstr "falta código en un criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1278 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1282 msgid "Create Template" msgstr "Crear plantilla" @@ -1637,7 +1655,7 @@ msgstr "Búsqueda avanzada" msgid "Filter by labels" msgstr "Filtrar por etiquetas" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:577 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:586 msgid "" "IMPORTANT: Don't forget to communicate to subcontractor that his contract " "has been cancelled" @@ -1668,10 +1686,10 @@ msgstr "Código de estado" #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:103 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:391 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:509 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:547 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:578 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:148 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:518 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:556 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:587 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:153 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:476 msgid "Warning" msgstr "Advertencia" @@ -1788,8 +1806,8 @@ msgstr "el nombre no puede ser nulo o vacío" msgid "Add From Template" msgstr "Añadir a partir de plantilla" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:508 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:546 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:517 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:555 msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "Los recursos asignados para esta tarea serán borrados. ¿Está seguro?" @@ -1824,7 +1842,7 @@ msgstr "Julio" msgid "Enable LDAP authentication" msgstr "Habilitar la autenticación LDAP" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:493 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:490 msgid "( max: {0} )" msgstr "( máx: {0} )" @@ -1845,7 +1863,7 @@ msgid "Cannot calculate charts for current data" msgstr "No se pueden calcular gráficos para los datos actuales" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:176 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1495 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1499 msgid "project name already being used" msgstr "el nombre de proyecto ya está siendo usado" @@ -1862,7 +1880,7 @@ msgstr "Dividir asignación" msgid "You can not remove the default scenario called \"{0}\"" msgstr "No se puede borrar el escenario por defecto, llamado \"{0}\"" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:522 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:519 msgid "There are not any assigned progress to current task" msgstr "No hay ningún progreso asignado a la tarea actual" @@ -1891,7 +1909,7 @@ msgstr "Abajo" msgid "Label" msgstr "Etiqueta" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:870 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:987 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" @@ -1908,8 +1926,8 @@ msgstr "falta el tipo de horas en una línea del parte de trabajo" msgid "Quality forms" msgstr "Formularios de calidad" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:499 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:509 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:497 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:507 msgid "Repeated Hours Group code {0} in Project {1}" msgstr "Código {0} de grupo de horas repetido en proyecto {1}" @@ -1921,7 +1939,7 @@ msgstr "Grupo de horas" msgid "LibrePlan: Accounts" msgstr "LibrePlan: Cuentas" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:96 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:97 #: libreplan-webapp/src/main/webapp/templates/_list.zul:30 msgid "Days from Beginning to Deadline" msgstr "Días desde el comienzo hasta la fecha límite" @@ -1954,7 +1972,7 @@ msgstr "Op." msgid "Pessimistic" msgstr "Pesimista" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:376 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:385 msgid "Limiting resource assignation" msgstr "Asignación de recursos limitantes" @@ -1985,7 +2003,7 @@ msgstr "El nombre del tipo de unidad no puede ser vacío" msgid "Entity sequences" msgstr "Secuencias de entidad" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:91 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:92 #: libreplan-webapp/src/main/webapp/templates/_list.zul:28 msgid "Delay from beginning (days)" msgstr "Retraso desde el comienzo (en días)" @@ -2015,7 +2033,7 @@ msgstr "Confirmar cancelación" msgid "Work And Progress Per Task" msgstr "Trabajo y progreso por tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1519 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1523 msgid "project code already being used" msgstr "el código del proyecto ya está siendo usado" @@ -2034,8 +2052,8 @@ msgstr "Borrando secuencia" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:457 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:208 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:264 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:840 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:875 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:844 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:879 msgid "Error on showing removing element: " msgstr "Error al mostrar el elemento a borrar: " @@ -2096,7 +2114,7 @@ msgid "Overload" msgstr "Sobrecarga" #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:30 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:68 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:69 msgid "Assignment log" msgstr "Histórico de asignación" @@ -2105,10 +2123,6 @@ msgstr "Histórico de asignación" msgid "Work Report Models" msgstr "Modelos de partes de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyCaptTimeout.java:45 -msgid "CutycaptTimeout thread exception" -msgstr "Excepción de thread CutycaptTimeout" - #: libreplan-webapp/src/main/webapp/materials/materials.zul:73 msgid "New" msgstr "Nuevo" @@ -2117,7 +2131,7 @@ msgstr "Nuevo" msgid "Date last progress measurement" msgstr "Fecha de la última medida de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:103 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:112 msgid "Deadline (days since beggining project)" msgstr "Fecha límite (días desde el inicio del proyecto)" @@ -2147,14 +2161,14 @@ msgstr "el nombre de tipo de criterio está siendo usado" msgid "Task code cannot be null" msgstr "El código de la tarea no puede ser nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:520 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:302 +msgid "Derived of calendar {0}" +msgstr "Derivado del calendario {0}" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:517 msgid "It is not allowed to consolidate progress." msgstr "No se permite consolidar progreso." -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32 -msgid "Create Task" -msgstr "Crear tarea" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27 msgid "External company" msgstr "Empresa externa" @@ -2163,10 +2177,10 @@ msgstr "Empresa externa" #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:60 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:61 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:27 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:107 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:140 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:108 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:129 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68 msgid "Actions" @@ -2239,11 +2253,15 @@ msgstr "El valor no es válido.\n El código no puede contener caracteres como ' msgid "Hours Group" msgstr "Grupo de horas" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1029 +msgid "Budget: {0}€, Consumed: {1}€ ({2}%)" +msgstr "Presupuesto: {0}€, Consumido: {1}€ ({2}%)" + #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:825 msgid "Unallocated name" msgstr "Nombre no asignado" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:924 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1041 msgid "Move up" msgstr "Mover arriba" @@ -2257,7 +2275,7 @@ msgstr "Fecha de comunicación de la subcontratación" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:131 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:134 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:281 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:301 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:269 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:367 msgid "Scheduling" @@ -2293,17 +2311,17 @@ msgstr "Página arriba" msgid "Create new project" msgstr "Crear nuevo proyecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:954 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1026 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:161 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:165 #: libreplan-webapp/src/main/webapp/orders/_list.zul:35 msgid "State" msgstr "Estado" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:80 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:90 msgid "Must start after" msgstr "Debe empezar después" @@ -2311,7 +2329,7 @@ msgstr "Debe empezar después" msgid "Confirm change" msgstr "Confirmar cambio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:845 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:849 msgid "You don't have permissions to edit this project" msgstr "No tiene permisos para editar este proyecto" @@ -2350,7 +2368,7 @@ msgstr "LibrePlan: Materiales" msgid "New task" msgstr "Nueva tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:191 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:197 msgid "The password for a new user cannot be empty" msgstr "La contraseña no puede ser vacía para un usuario nuevo" @@ -2402,7 +2420,7 @@ msgstr "Detalles personales" msgid "Workers List" msgstr "Lista de trabajadores" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:355 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:375 msgid "Delete project template. Are you sure?" msgstr "Borrar plantilla de proyecto. ¿Está seguro?" @@ -2483,18 +2501,18 @@ msgstr "Otros proyectos" msgid "Tasks input buffer" msgstr "Buffer de tareas de entrada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:168 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:173 msgid "At least one {0} sequence must be active" msgstr "Al menos una secuencia de {0} debe estar activa" #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:26 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:139 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 msgid "Profile name" msgstr "Nombre del perfil" -#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java:252 +#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java:246 msgid "Could open generated PDF" msgstr "No se pudo abrir el PDF generado" @@ -2506,7 +2524,7 @@ msgstr "Deshabilitar borrado" msgid "You should select a source scenario" msgstr "Debe seleccionar un escenario de origen" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:163 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:168 msgid "At least one {0} sequence is needed" msgstr "Se necesita al menos una secuencia de {0}" @@ -2541,18 +2559,18 @@ msgid "" "to generate usage statistics" msgstr "Marca esta opción para enviar información a los desarroladores de LibrePlan para generar estadísticas de uso" -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:36 -msgid "More options" -msgstr "Más opciones" +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesModel.java:219 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java:179 +msgid "Error: {0}" +msgstr "Error: {0}" #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 msgid "Communication" msgstr "Comunicación" -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesModel.java:219 -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java:179 -msgid "Error: {0}" -msgstr "Error: {0}" +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:36 +msgid "More options" +msgstr "Más opciones" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:240 msgid "Confirm create template" @@ -2584,7 +2602,7 @@ msgstr "LibrePlan: trabajo y progreso por tarea" msgid "Projects" msgstr "Proyectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1102 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1128 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:269 msgid "Confirm exit dialog" msgstr "Diálogo para confirmar la salida" @@ -2662,7 +2680,7 @@ msgstr "Registro de trabajo" msgid "Output format" msgstr "Formato de salida" -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:47 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:49 msgid "Print" msgstr "Imprimir" @@ -2682,8 +2700,8 @@ msgstr "el tipo de recurso no permite criterios habilitados" msgid "Effort cannot be null" msgstr "El esfuerzo no puede ser nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1093 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:52 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1119 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:126 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106 @@ -2695,16 +2713,16 @@ msgstr "El esfuerzo no puede ser nulo" #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:80 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:137 -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:48 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:50 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:81 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:50 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:91 #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42 #: libreplan-webapp/src/main/webapp/planner/order.zul:131 #: libreplan-webapp/src/main/webapp/planner/order.zul:166 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:85 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:166 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:139 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:74 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:147 #: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:58 #: libreplan-webapp/src/main/webapp/calendars/calendars.zul:47 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:103 @@ -2740,8 +2758,8 @@ msgid "Machines List" msgstr "Lista de máquinas" #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:320 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:692 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:904 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:696 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:908 msgid "You don't have read access to this project" msgstr "No tiene acceso de lectura a este proyecto" @@ -2817,7 +2835,7 @@ msgstr "{0} (máx: {1})" msgid "Cost Category" msgstr "Categoría de coste" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:471 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:473 msgid "end" msgstr "fin" @@ -2838,7 +2856,7 @@ msgstr "Autorizaciones" msgid "Continue" msgstr "Continuar" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementController.java:121 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementController.java:122 msgid "Edit task {0}" msgstr "Editar tarea {0}" @@ -2871,7 +2889,7 @@ msgstr "Valor máximo por defecto" msgid "Add criterion requirement" msgstr "Añadir criterio requerido" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:860 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:864 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 " @@ -2911,7 +2929,7 @@ msgstr "LibrePlan: Cambiar la contraseña" msgid "please, select a label" msgstr "por favor, seleccione una etiqueta" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:134 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:123 msgid "Add profile" msgstr "Añadir perfil" @@ -2990,8 +3008,8 @@ msgstr "el nombre no puede ser vacío" msgid "Disabled" msgstr "Deshabilitado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:738 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:325 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:764 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:322 msgid "Earned value" msgstr "Valor ganado" @@ -3020,8 +3038,8 @@ msgid "" "Please save your project before proceeding." msgstr "Las plantillas sólo pueden ser creadas a partir de tareas existentes. Está intentando crear unha plantilla a partir de una tarea nueva.\nPor favor guarde su proyecto antes de continuar." -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1163 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1178 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1243 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1258 msgid "{0} not supported yet" msgstr "{0} aún no soportado" @@ -3043,7 +3061,7 @@ msgstr "Entrada nueva" msgid "Resources Load" msgstr "Carga de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:220 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:225 msgid "Some sequences to remove not existed" msgstr "Algunas secuencias para borrar no existen" @@ -3118,11 +3136,11 @@ msgid "Select start date" msgstr "Seleccionar fecha de inicio" #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:106 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:152 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:157 msgid "Error on showing warning message removing typeOfWorkHours: " msgstr "Error al mostrar mensaje de advertencia borrando tipo de horas de trabajo: " -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:882 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:886 msgid "Removed {0}" msgstr "{0} borrado" @@ -3134,8 +3152,8 @@ msgstr "Confirmar el borrado de este trabajador. ¿Está seguro?" msgid "Group name" msgstr "Nombre del grupo" -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:59 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:106 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:60 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:107 msgid "Role name" msgstr "Nombre del rol" @@ -3151,8 +3169,8 @@ msgstr "Crear parte de trabajo" msgid "Value is not valid, the precision value must not be empty" msgstr "El valor no es válido, el valor de precisión no debe ser vacío" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:863 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:473 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:889 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:470 msgid "h" msgstr "h" @@ -3177,7 +3195,7 @@ msgstr "Añadir hito" msgid "Assign selected items" msgstr "Asignar elementos seleccionados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:450 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:452 msgid "init" msgstr "inicio" @@ -3254,6 +3272,10 @@ msgstr "Cliente" msgid "Hours type" msgstr "Tipo de horas" +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:43 +msgid "Show money cost bar" +msgstr "Monstrar barra de coste monetario" + #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:156 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:211 msgid "criterion type name not specified" @@ -3267,11 +3289,11 @@ msgstr "No se puede conectar al servidor de LDAP" msgid "Add Exception" msgstr "Añadir excepción" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:220 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:222 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:202 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:223 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:247 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:378 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:379 msgid "cannot be empty" msgstr "no puede ser vacío" @@ -3395,7 +3417,7 @@ msgstr "Opciones de exportación" #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:145 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:94 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:40 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:80 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:81 #: libreplan-webapp/src/main/webapp/templates/_list.zul:27 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:45 @@ -3464,7 +3486,7 @@ msgstr "Horas trabajadas por recurso" msgid "The end date cannot be before the init date" msgstr "La fecha de fin no puede ser anterior a la fecha de inicio" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:117 msgid "" "Profiles of LDAP users cannot be managed because LDAP roles are being used." msgstr "Los perfiles de los usuarios de LDAP no se pueden gestionar porque los roles de LDAP están siendo usados." @@ -3560,7 +3582,7 @@ msgstr "Grupo de trabajadores virtuales" msgid "Changes saved" msgstr "Cambios guardados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1263 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1267 msgid "See scheduling" msgstr "Ver planificación" @@ -3589,7 +3611,7 @@ msgid "Work report saved" msgstr "Parte de trabajo guardado" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractCommand.java:53 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:377 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:386 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:68 msgid "Subcontract" msgstr "Subcontratar" @@ -3625,10 +3647,6 @@ msgstr "no puede ser vacío" msgid "April" msgstr "Abril" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:302 -msgid "Derived of Calendar " -msgstr "Derivado del calendario " - #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:22 msgid "Users List" msgstr "Lista de usuarios" @@ -3686,14 +3704,14 @@ msgstr "Filtrar formularios de calidad por" msgid "Unindent selected task" msgstr "Desindentar tarea seleccionada" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:62 -msgid "Constraint" -msgstr "Restricción" - #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 msgid "Customer reference code" msgstr "Código de referencia del cliente" +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:66 +msgid "Constraint" +msgstr "Restricción" + #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150 msgid "Add New Label Type Field" msgstr "Añadir nuevo campo de tipo de etiqueta" @@ -3712,16 +3730,16 @@ msgstr "Referencia de cliente" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:146 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:311 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:321 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:693 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:846 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:896 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:905 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:932 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:697 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:850 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:900 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:909 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:936 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 msgid "Information" msgstr "Información" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:931 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:935 msgid "Sorry, you do not have permissions to access this project" msgstr "Lo sentimos, no tiene permisos para acceder a este proyecto" @@ -3745,7 +3763,7 @@ msgstr "Nuevo grupo de horas " msgid "Assign element to queue manually" msgstr "Asignar elemento a cola manualmente" -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:47 msgid "Please remember that only saved changes will be printed" msgstr "Por favor recuerda que sólo los cambios guardados serán impresos" @@ -3790,6 +3808,10 @@ msgstr "Tipo de excepción de calendario no encontrado" msgid "Unable to convert value to {0} type" msgstr "No se pudo convertir el valor a tipo {0}" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:81 +msgid "Total task budget" +msgstr "Presupuesto total de la tarea" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:222 msgid "Worker must be not-null" msgstr "El trabajador no debe ser nulo" @@ -3798,14 +3820,14 @@ msgstr "El trabajador no debe ser nulo" msgid "Some criterion satisfactions overlap in time" msgstr "Algunos criterios satisfechos se solapan en el tiempo" -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 -msgid "LibrePlan: Materials Needs At Date" -msgstr "LibrePlan: Necesidad de materiales en fecha" - #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:49 msgid "Value last progress measurement" msgstr "Valor última medida de progreso" +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 +msgid "LibrePlan: Materials Needs At Date" +msgstr "LibrePlan: Necesidad de materiales en fecha" + #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44 msgid "Worker assignments" msgstr "Asignaciones de trabajador" @@ -4034,7 +4056,7 @@ msgid "Check consolidated progresses" msgstr "Marcar progresos consolidados" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1469 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:585 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:587 msgid "Show all" msgstr "Mostrar todo" @@ -4052,7 +4074,7 @@ msgid "Apply tab changes" msgstr "Aplicar cambios de la pestaña" #: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:99 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:170 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:176 msgid "passwords don't match" msgstr "las contraseñas no conciden" @@ -4172,7 +4194,7 @@ msgstr "No indentable" msgid "List of materials for all categories (select one to filter)" msgstr "Lista de materiales para todas las categorías (seleccione una para filtrar)" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:69 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:73 msgid "Resource allocation type" msgstr "Tipo de asignación de recursos" @@ -4189,7 +4211,7 @@ msgstr "Tipo de excepción" msgid "In the available periods {0} only {1} hours are available." msgstr "En los períodos disponibles {0} solo {1} horas están disponibles." -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:126 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:115 msgid "Association with profiles" msgstr "Asociación con perfiles" @@ -4231,7 +4253,7 @@ msgstr "Base" msgid "Total dedication" msgstr "Dedicación total" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:683 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:686 msgid "" "You can not remove the task \"{0}\" because of this or any of its children " "are already in use in some work reports" @@ -4432,8 +4454,8 @@ msgstr "Habilitar/Deshabilitar la advertencia sobre nuevas versiones de LibrePla msgid "Select type" msgstr "Seleccione tipo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:950 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:679 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1021 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:685 msgid "Hours invested" msgstr "Horas invertidas" @@ -4503,7 +4525,7 @@ msgstr "Vista de la compañía" msgid "Both" msgstr "Ambos" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:765 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:882 msgid "Not editable for containing more that an hours group." msgstr "No editable por contener más de un grupo de horas." @@ -4577,6 +4599,7 @@ msgid "LibrePlan: Transfer Projects Between Scenarios" msgstr "LibrePlan: transferir proyectos entre escenarios" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:118 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:166 msgid "%" msgstr "%" @@ -4587,14 +4610,14 @@ msgstr "Borrar calendario" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1536 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1700 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:336 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:273 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:338 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:274 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:141 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:633 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:425 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:257 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:670 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1328 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:673 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1332 msgid "must be lower than finish date" msgstr "debe ser menor que la fecha de fin" @@ -4615,14 +4638,14 @@ msgstr "Recurso" msgid "Total task hours" msgstr "Total de horas de tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/RedirectorSynthetiser.java:125 -msgid "Could not load any resource" -msgstr "No se pudo cargar un recurso" - #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:46 msgid "Date last progress reported" msgstr "Fecha último progreso notificado" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/RedirectorSynthetiser.java:125 +msgid "Could not load any resource" +msgstr "No se pudo cargar un recurso" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:37 msgid "Work And Progress Per Project" @@ -4685,7 +4708,7 @@ msgstr "Lista de líneas de parte de trabajo" msgid "Unit type code cannot be empty" msgstr "El código del tipo de unidad no puede ser vacío" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:183 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:189 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 msgid "Users" msgstr "Usuarios" @@ -4718,8 +4741,8 @@ msgid "" "completed." msgstr "Otro usuario ha modificado los mismos datos, por tanto la operación no se puede completar de manera segura." -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:218 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:232 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:223 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:244 msgid "Template saved" msgstr "Plantilla guardada" @@ -4758,7 +4781,7 @@ msgstr "Salir de la sesión" #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:31 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:53 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:67 -#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineGroupTemplate.java:243 +#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineGroupTemplate.java:244 msgid "Group" msgstr "Grupo" @@ -4823,9 +4846,9 @@ msgstr "Actualización incompatible: el recurso almacenado no es de tipo: {0}" #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:78 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:134 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:83 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:164 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:137 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:72 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:145 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:114 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:100 #: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:92 @@ -4893,7 +4916,7 @@ msgstr "Planificar desde la fecha límite al principio" msgid "generic machines allocation" msgstr "asignación genérica de máquinas" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:375 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:384 msgid "Non limiting resource assignation" msgstr "Asignación de recursos no limitantes" @@ -4916,13 +4939,13 @@ msgstr "Administración" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1519 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1682 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:317 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:255 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:319 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:256 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:616 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:240 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:652 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1311 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:655 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1315 msgid "must be greater than start date" msgstr "debe ser mayor que la fecha de inicio" @@ -4935,6 +4958,10 @@ msgstr "Cancelar y volver" msgid "Assign quality form" msgstr "Asignar formulario de calidad" +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:157 +msgid "Calculated budget" +msgstr "Presupuesto calculado" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:387 msgid "Delete item {0}. Are you sure?" msgstr "Borrar elemento {0}. ¿Está seguro?" @@ -4960,6 +4987,10 @@ msgstr "una línea de parte de trabajo no tiene este tipo de etiqueta asignada" msgid "Allocations" msgstr "Asignaciones" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:137 +msgid "Choosing Template" +msgstr "Eligiendo plantilla" + #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:66 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 msgid "Capacity" @@ -5004,7 +5035,7 @@ msgstr "No se han hecho asignaciones" msgid "Removed calendar \"{0}\"" msgstr "Borrado calendario \"{0}\"" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1068 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1072 msgid "Create project" msgstr "Crear proyecto" @@ -5045,29 +5076,29 @@ msgstr "No se pudieron añadir esas autorizaciones al usuario {0} porque ya esta msgid "New work report" msgstr "Nuevo parte de trabajo" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:305 +msgid "Root calendar" +msgstr "Calendario raíz" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:847 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578 msgid "yes" msgstr "sí" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:305 -msgid "Root calendar" -msgstr "Calendario raíz" - -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:867 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:871 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?" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:278 -msgid "Port" -msgstr "Puerto" - #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:113 msgid "Select gap" msgstr "Seleccionar intervalo" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:278 +msgid "Port" +msgstr "Puerto" + #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:63 msgid "Date Finish" msgstr "Fecha de fin" @@ -5095,7 +5126,11 @@ msgstr "Asignación de categoría de coste" msgid "missing code in a hour cost" msgstr "falta código en un coste por hora" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:902 +#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:247 +msgid "Exception Day Type" +msgstr "Tipo de día de excepción" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:973 msgid "All workers" msgstr "Todos los trabajadores" @@ -5119,14 +5154,16 @@ msgstr "Grupo de horas {0} : Código duplicado en BD" #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:311 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:207 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:307 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:110 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:130 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:994 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1184 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1441 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:135 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:171 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:115 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1488 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1512 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1492 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1516 #: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:757 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:45 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:53 @@ -5193,10 +5230,6 @@ msgstr "Tipo de unidad" msgid "Load due to other assignments" msgstr "Carga debido a otras asignaciones" -#: libreplan-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" - #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:554 msgid "This machine was already removed by other user" msgstr "Esta máquina ya ha sido borrada por otro usuario" @@ -5269,11 +5302,11 @@ msgstr "Nombre de usuario de nuestra empresa" msgid "Filter work reports" msgstr "Filtrar partes de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:947 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:678 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:601 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1018 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:684 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:603 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:328 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:63 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:64 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:48 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:46 @@ -5336,7 +5369,7 @@ msgstr "opciones" msgid "LibrePlan: Work Reports" msgstr "LibrePlan: Partes de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:373 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:393 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:393 msgid "Error on showing delete confirm" msgstr "Error al mostrar la confirmación de borrado" @@ -5361,7 +5394,7 @@ msgstr "Agrupar por semanas" msgid "Finish hour" msgstr "Hora de fin" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:200 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:196 msgid "Done {0} of {1}" msgstr "Hecho {0} de {1}" @@ -5417,16 +5450,16 @@ msgstr "Esta medida de progreso no puede estar en " msgid "Inherited labels" msgstr "Etiquetas heredadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:946 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 -msgid "Unindent" -msgstr "Desindentar" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:939 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1406 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" +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1063 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 +msgid "Unindent" +msgstr "Desindentar" + #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:50 msgid "Direct labels" msgstr "Etiquetas directas" @@ -5490,7 +5523,7 @@ msgstr "El código de secuencia ya está en uso y no se puede actualizar." msgid "Scheduling state" msgstr "Estado de planificación" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:369 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:389 msgid "This template can not be removed because it has applications." msgstr "Esta plantilla no se puede borrar porque tiene aplicaciones." @@ -5510,6 +5543,10 @@ msgstr "LibrePlan: Horas Trabajadas Por Recurso" msgid "Number of iterations should be between 1 and " msgstr "El número de iteraciones debería estar entre 1 y " +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:151 +msgid "Budget in money" +msgstr "Presupuesto en dinero" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:145 msgid "Scenarios must be enabled as more elements than master exist" msgstr "Los escenarios deben estar habilitados ya que existen más elementos que master" @@ -5552,7 +5589,7 @@ msgstr "Her" msgid "Administrator" msgstr "Administrador" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:190 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:186 msgid "Doing {0} reassignations" msgstr "Realizando {0} reasignaciones" @@ -5588,7 +5625,7 @@ msgstr "No se puede borrar el tipo de parte de trabajo. Hay algún parte de trab msgid "Criterion Type List" msgstr "Lista de tipos de criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:739 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:765 msgid "Overall progress" msgstr "Progreso global" @@ -5612,7 +5649,7 @@ msgstr "Contraseña" msgid "Observations" msgstr "Observaciones" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:947 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:951 msgid "Edit project" msgstr "Editar proyecto" @@ -5667,7 +5704,6 @@ msgstr "Borrar {0} \"{1}\". ¿Está seguro?" msgid "Only {0} resources per day were achieved for current allocation" msgstr "Sólo se han logrado {0} recursos por día para la asignación actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:51 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:79 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:48 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:89 @@ -5714,6 +5750,10 @@ msgstr "Completado: {0}% " msgid "Calculated progress measurement can not be removed" msgstr "Las medidas de progreso calculadas no se pueden borrar" +#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:252 +msgid "Exception Day Types" +msgstr "Tipos de día de excepción" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java:335 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java:341 msgid " The " @@ -5757,6 +5797,10 @@ msgstr "Aplicar cambios y continuar la edición" msgid "Infinitely Over Assignable" msgstr "Sobreasignable infinitamente" +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:157 +msgid "Money spent" +msgstr "Dinero gastado" + #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:426 msgid "criterion names must be unique inside a criterion type" msgstr "el nombre del criterio debe ser único dentro de un tipo de criterio" @@ -5792,7 +5836,7 @@ msgstr "Los períodos disponibles dependen de la satisfacción de criterios por #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:86 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:116 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:95 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:85 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:86 #: libreplan-webapp/src/main/webapp/templates/_list.zul:26 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:54 @@ -5849,15 +5893,20 @@ msgstr "Fecha de inicio" msgid "Update exception" msgstr "Actualizar excepción" -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 -msgid "Budget" -msgstr "Presupuesto" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:253 msgid "Operation cannot be done" msgstr "No se puede efectuar la operación" +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:91 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:80 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:62 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:107 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 +#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:65 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 +msgid "Budget" +msgstr "Presupuesto" + #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "May" msgstr "Mayo" @@ -5891,7 +5940,7 @@ msgstr "Número de aplicaciones" msgid "Assign element to queue automatically" msgstr "Asignar elemento a la cola automáticamente" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:82 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:92 msgid "" "Date which the task must start after (press enter in textbox to open " "calendar popup or type in date directly)" @@ -5927,8 +5976,8 @@ msgstr "Este tipo de etiqueta ya está asignado al tipo de parte de trabajo." msgid "Probability %" msgstr "Probabilidad %" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:737 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:324 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:763 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:321 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:815 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49 msgid "Load" @@ -5939,12 +5988,12 @@ msgstr "Carga" msgid "New criterion" msgstr "Criterio nuevo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:683 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:689 #: libreplan-webapp/src/main/webapp/materials/materials.zul:81 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:43 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:49 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:101 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:102 #: libreplan-webapp/src/main/webapp/templates/_list.zul:32 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 @@ -5968,7 +6017,7 @@ msgstr "Nodo seleccionado" msgid "already exists an allocation for criteria {0}" msgstr "ya existe una asignación para los criterios {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:283 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:303 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:294 msgid "Project Templates" msgstr "Plantillas de proyectos" @@ -5995,7 +6044,7 @@ msgstr "No asignado" msgid "At least one HoursGroup is needed" msgstr "Es necesario al menos un grupo de horas" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:178 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:184 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:74 #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:165 @@ -6059,8 +6108,8 @@ msgstr "Carga 100%" msgid "Function" msgstr "Función" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:799 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:363 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:825 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:360 msgid "date in future" msgstr "fecha en el futuro" @@ -6075,14 +6124,14 @@ msgstr "fecha en el futuro" msgid "Format" msgstr "Formato" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:887 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:885 msgid "New project version" msgstr "Nueva versión de proyecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:77 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:79 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:366 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:484 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1231 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:486 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1235 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478 #: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:537 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:37 @@ -6253,7 +6302,7 @@ msgstr "El valor no es válido, el valor debe ser mayor que el valor del progres msgid "BCWS" msgstr "BCWS" -#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java:351 +#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java:343 msgid " in the specified directory." msgstr " en el directorio especificado." @@ -6306,7 +6355,7 @@ msgstr "Coste de trabajo realizado" msgid "Create project from Template" msgstr "Crear proyecto a partir de plantilla" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:418 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:420 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" @@ -6317,11 +6366,15 @@ msgstr "El valor no es válido.\n El código no puede contener caracteres como ' msgid "an authorization type must be set" msgstr "debe seleccionar un tipo de autorización" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:92 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:101 msgid "Must start after (days since beginning project)" msgstr "Debe empezar después de (días desde el inicio del proyecto)" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:886 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:134 +msgid "Percentage of estimated budget in money / money spent" +msgstr "Porcentaje de presupuesto estimado / dinero gastado" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:884 msgid "" "Confirm creating a new project version for this scenario and derived. Are " "you sure?" @@ -6369,7 +6422,7 @@ msgstr "Deseleccionar" msgid "You should select the type of exception" msgstr "Debe seleccionar el tipo de excepción" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:93 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:103 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:63 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 @@ -6421,7 +6474,7 @@ msgstr "Asignación avanzada" msgid "Number of iterations" msgstr "Número de iteraciones" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:60 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:61 msgid "Template Tree" msgstr "Árbol de plantillas" @@ -6448,11 +6501,15 @@ msgstr "el esfuerzo no está bien calculado basándose en el reloj" msgid "Status" msgstr "Estado" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:321 +msgid "from {0}" +msgstr "desde {0}" + #: libreplan-webapp/src/main/webapp/settings/settings.zul:111 msgid "Resource load view" msgstr "Vista de carga de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:787 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:813 msgid "the date must be inside the visualization area" msgstr "la fecha debe estar dentro del área de visualización" @@ -6602,8 +6659,8 @@ msgid "Task Scheduling Status In Project" msgstr "Estado de planificación de tareas en un proyecto" #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:162 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:356 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:868 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:376 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:872 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313 msgid "Confirm" msgstr "Confirmar" @@ -6655,8 +6712,8 @@ msgstr "Precio total" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1214 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:346 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:984 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:990 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1101 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1107 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:289 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 @@ -6675,7 +6732,7 @@ msgstr "Precio total" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:201 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:333 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:406 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1247 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1251 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:49 @@ -6700,10 +6757,8 @@ msgstr "Precio total" #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:154 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:106 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:46 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:68 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:40 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:115 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:148 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:137 #: libreplan-webapp/src/main/webapp/templates/_list.zul:53 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52 @@ -6803,7 +6858,7 @@ msgid "Stretches" msgstr "Tramos" #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:79 -msgid "Interporlation" +msgid "Interpolation" msgstr "Interpolación" #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:80 @@ -6867,23 +6922,23 @@ msgstr "En progreso" msgid "Blocked" msgstr "Bloqueado" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:29 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:31 msgid "as soon as possible" msgstr "tan pronto como sea posible" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:41 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:38 msgid "start not earlier than" msgstr "empezar no antes de" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:53 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:45 msgid "start in fixed date" msgstr "comenzar en fecha fija" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:65 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:57 msgid "as late as possible" msgstr "tan tarde como sea posible" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:77 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:64 msgid "finish not later than" msgstr "acabar no después de" @@ -6923,7 +6978,7 @@ msgstr "Permiso de edición para todos los proyectos" msgid "Project creation allowed" msgstr "Permiso de creación de proyectos" -#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:122 +#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:132 msgid "Line" msgstr "Línea" @@ -7091,23 +7146,23 @@ msgstr "P" msgid "U" msgstr "D" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:618 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:629 msgid "" "Some ancestor has the same label assigned, so this element is already " "inheriting this label" msgstr "Algún ancestro tiene la misma etiqueta asignada, por lo que este elemento ya está heredando esa etiqueta" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:717 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:728 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:963 msgid "Cannot spread two progress in the same task" msgstr "No pueden propagar dos progresos en la misma tarea" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:741 -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:767 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:752 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:778 msgid "Duplicate Progress Assignment For Task" msgstr "Asignación de progreso duplicada para la tarea" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1094 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1105 msgid "Quality form already exists" msgstr "El formulario de calidad ya existe" diff --git a/libreplan-webapp/src/main/resources/i18n/gl.po b/libreplan-webapp/src/main/resources/i18n/gl.po index e8f72411c..26ecdc1e4 100644 --- a/libreplan-webapp/src/main/resources/i18n/gl.po +++ b/libreplan-webapp/src/main/resources/i18n/gl.po @@ -9,10 +9,10 @@ # Manuel Rego Casasnovas , 2010, 2011, 2012. msgid "" msgstr "" -"Project-Id-Version: 1.2.2\n" +"Project-Id-Version: libreplan-1.2.3\n" "Report-Msgid-Bugs-To: http://bugs.libreplan.org/\n" -"POT-Creation-Date: 2012-02-24 09:08+0100\n" -"PO-Revision-Date: 2012-02-24 10:02+0000\n" +"POT-Creation-Date: 2012-04-11 08:32+0200\n" +"PO-Revision-Date: 2012-04-11 08:34+0000\n" "Last-Translator: Manuel Rego Casasnovas \n" "Language-Team: Galego\n" "MIME-Version: 1.0\n" @@ -151,7 +151,7 @@ msgstr "Non pode estar baleiro" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 #: libreplan-webapp/src/main/webapp/materials/materials.zul:33 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:66 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:67 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:54 @@ -160,7 +160,7 @@ msgstr "Non pode estar baleiro" msgid "Materials" msgstr "Materiais" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:361 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:357 msgid "Reassign" msgstr "Reasignar" @@ -201,7 +201,7 @@ msgstr "Predefinido" #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:344 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:67 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:68 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53 msgid "Quality Forms" msgstr "Formularios de calidade" @@ -210,11 +210,15 @@ msgstr "Formularios de calidade" msgid "Reports" msgstr "Informes" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:117 +msgid "Create task" +msgstr "Crear tarefa" + #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:22 msgid "LibrePlan: Advanced allocation" msgstr "LibrePlan: Asignación avanzada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:172 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:177 msgid "The {0} sequence prefixes can not be repeated" msgstr "Os prefixos da secuencia de {0} non poden repetirse" @@ -301,7 +305,7 @@ msgid "generic workers allocation" msgstr "Asignación xenérica de traballadores" #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:310 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:895 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 msgid "The project has no scheduled elements" msgstr "O proxecto no ten elementos planificados" @@ -379,19 +383,19 @@ msgstr "Fai clic neste" msgid "Project Name" msgstr "Nome do proxecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:967 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1084 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306 msgid "Indent" msgstr "Indentar" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:252 +msgid "Reassignation" +msgstr "Reasignación" + #: libreplan-webapp/src/main/webapp/common/configuration.zul:327 msgid "Save passwords in database" msgstr "Gardar contrasinais na base de datos" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:256 -msgid "Reassignation" -msgstr "Reasignación" - #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:42 msgid "New template" msgstr "Novo modelo" @@ -460,7 +464,7 @@ msgid "" "applicable to this resource" msgstr "existen criterios satisfeitos que pertencen a tipos de criterio non aplicables a este recurso" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:65 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:66 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:52 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:50 msgid "Criterion Requirement" @@ -595,7 +599,7 @@ msgstr "Outubro" msgid "First name" msgstr "Nome" -#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java:256 +#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java:250 msgid "Could not execute print command" msgstr "Non se puido executar o comando de impresión" @@ -608,7 +612,7 @@ msgstr "Campos de texto complementario" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:452 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:832 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:836 msgid "Confirm deleting {0}. Are you sure?" msgstr "Confirmar o borrado de {0}. ¿Está seguro?" @@ -735,7 +739,7 @@ msgstr "Este proxecto xa fora engadido." msgid "The task code cannot be null" msgstr "O código da tarefa non pode ser nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:594 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:596 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:329 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 @@ -812,7 +816,7 @@ msgstr "Xuño" msgid "{0} annotation required on {1}" msgstr "{0} anotación obrigatoria en {1}" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1067 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1193 msgid "Modified" msgstr "Modificado" @@ -877,7 +881,7 @@ msgstr "O progreso calculado non se pode modificar" msgid "Work done from starting date" msgstr "Traballo realizado desde a data de inicio" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:69 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:70 msgid "Statistics log" msgstr "Histórico de estadísticas" @@ -886,7 +890,7 @@ msgstr "Histórico de estadísticas" msgid "Edit Calendar" msgstr "Editar calendario" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:112 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:117 msgid "Profile" msgstr "Perfil" @@ -909,7 +913,7 @@ msgstr "Non pode ser baleiro ou nulo" msgid "{0} \"{1}\" saved" msgstr "{0} \"{1}\" gardado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:299 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:301 msgid "filtering" msgstr "filtrado" @@ -966,6 +970,12 @@ msgstr "Este criterio xa fora engadido." msgid "add" msgstr "engadir" +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:860 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:111 +#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:69 +msgid "Budget value cannot be negative" +msgstr "O valor do orzamento non pode ser negativo" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:239 msgid "Unsaved changes will be lost. Would you like to continue?" msgstr "Perderánse os cambios sen gardar. Gustaríalle continuar?" @@ -1043,8 +1053,8 @@ msgstr "Engadir rol" msgid "Exception end date should be greater or equals than start date" msgstr "A data de fin dunha excepción debe ser maior ou igual cá data de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:476 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:486 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:474 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:484 msgid "Repeated Project code {0} in Project {1}" msgstr "Código {0} de proxecto repetedio no proxecto {1}" @@ -1074,7 +1084,7 @@ msgstr "Data de inicio máis cedo" msgid "Type data" msgstr "Datos do tipo" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:117 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:122 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 msgid "Profiles" msgstr "Perfís" @@ -1220,13 +1230,13 @@ msgstr "Listado de perfís" msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "{0} da categoría {1} e {2} da categoría {3} teñen o mesmo código" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:958 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:236 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:690 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:581 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1039 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:240 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:696 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:583 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:68 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:64 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:65 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:50 msgid "Labels" @@ -1236,7 +1246,7 @@ msgstr "Etiquetas" msgid "Data Types" msgstr "Tipos de datos" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:157 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:161 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68 msgid "Total hours" msgstr "Total de horas" @@ -1253,8 +1263,8 @@ msgstr "Reasignando {0} proxectos" msgid "Filter by task status" msgstr "Filtrar por estado da tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:528 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:419 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:529 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:416 msgid "Select date" msgstr "Seleccione data" @@ -1271,19 +1281,23 @@ msgstr "Por favor, volva a intentalo." msgid "Company code" msgstr "Código da empresa" +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:62 +msgid "Sum of imputed hours in children tasks" +msgstr "Suma de horas imputadas nas tarefas fillas" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/TwoWaySelector.java:110 msgid "Unknown attribute '{0}' in class {1}" msgstr "Atributo descoñecido '{0}' na clase {1}" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:96 +msgid "passwords can not be empty" +msgstr "os contrasinais non poden estar baleiros" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:699 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:33 msgid "NON LIMITING RESOURCE" msgstr "RECURSO NON LIMITANTE" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:96 -msgid "passwords can not be empty" -msgstr "os contrasinais non poden estar baleiros" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:88 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:128 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:176 @@ -1432,11 +1446,15 @@ msgstr "Lista de tramos" msgid "Enable scenarios module" msgstr "Habilitar módulo de escenarios" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:312 +msgid "to {0}" +msgstr "ata {0}" + #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:59 msgid "Zoom" msgstr "Zoom" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:865 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:863 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112 #: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91 @@ -1452,9 +1470,9 @@ msgstr "Zoom" #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:131 #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:81 #: libreplan-webapp/src/main/webapp/settings/settings.zul:124 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:81 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:162 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:135 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:70 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:151 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:143 #: libreplan-webapp/src/main/webapp/calendars/calendars.zul:44 #: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:40 #: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:41 @@ -1513,7 +1531,7 @@ msgstr "Problemas conectando co servizo web subcontratista" msgid "Entity type" msgstr "Tipo de entidade" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1101 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1127 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:268 msgid "Unsaved changes will be lost. Are you sure?" msgstr "Perderánse os cambios sen gardar. Está seguro?" @@ -1554,13 +1572,13 @@ msgstr "Recursos por día" msgid "ResourceType must be not-null" msgstr "ResourceType non debe ser nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:95 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:105 msgid "" "Estimated end date for the task (press enter in textbox to open calendar " "popup or type in date directly)" msgstr "Data de fin estimada para a tarefa (presione enter no cadro de texto para abrir o calendario ou escriba a data directamente)" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:292 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:293 msgid "Expand/Collapse all" msgstr "Expandir/Pregar todo" @@ -1568,11 +1586,11 @@ msgstr "Expandir/Pregar todo" msgid "Overload due to current project" msgstr "Sobrecarga debido ao proxecto actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:946 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1017 msgid "Name: {0}" msgstr "Nome: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:903 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1020 msgid "Move down" msgstr "Mover abaixo" @@ -1619,7 +1637,7 @@ msgstr "Asignar" msgid "missing code in a criterion" msgstr "falta código nun criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1278 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1282 msgid "Create Template" msgstr "Crear modelo" @@ -1636,7 +1654,7 @@ msgstr "Búsqueda avanzada" msgid "Filter by labels" msgstr "Filtrar por etiquetas" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:577 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:586 msgid "" "IMPORTANT: Don't forget to communicate to subcontractor that his contract " "has been cancelled" @@ -1667,10 +1685,10 @@ msgstr "Código de estado" #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:103 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:391 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:509 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:547 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:578 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:148 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:518 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:556 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:587 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:153 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:476 msgid "Warning" msgstr "Advertencia" @@ -1787,8 +1805,8 @@ msgstr "o nome non pode ser nulo ou baleiro" msgid "Add From Template" msgstr "Engadir a partir de modelo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:508 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:546 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:517 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:555 msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "Os recursos asignados para esta tarefa serán borrados. Está seguro?" @@ -1823,7 +1841,7 @@ msgstr "Xullo" msgid "Enable LDAP authentication" msgstr "Habilitar a autenticación LDAP" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:493 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:490 msgid "( max: {0} )" msgstr "( máx: {0} )" @@ -1844,7 +1862,7 @@ msgid "Cannot calculate charts for current data" msgstr "Non se poden calcular gráficos para os datos actuais" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:176 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1495 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1499 msgid "project name already being used" msgstr "o nome de proxecto xa está sendo usado" @@ -1861,7 +1879,7 @@ msgstr "Dividir asignación" msgid "You can not remove the default scenario called \"{0}\"" msgstr "Non se pode borrar o escenario por defecto, chamado \"{0}\"" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:522 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:519 msgid "There are not any assigned progress to current task" msgstr "Non hai ningún progreso asignado á tarefa actual" @@ -1890,7 +1908,7 @@ msgstr "Abaixo" msgid "Label" msgstr "Etiqueta" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:870 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:987 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" @@ -1907,8 +1925,8 @@ msgstr "falta tipo de horas de traballo nunha liña do parte" msgid "Quality forms" msgstr "Formularios de calidade" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:499 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:509 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:497 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:507 msgid "Repeated Hours Group code {0} in Project {1}" msgstr "Código {0} de groupo de horas repetido no proxecto {1}" @@ -1920,7 +1938,7 @@ msgstr "Grupo de horas" msgid "LibrePlan: Accounts" msgstr "LibrePlan: Contas" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:96 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:97 #: libreplan-webapp/src/main/webapp/templates/_list.zul:30 msgid "Days from Beginning to Deadline" msgstr "Días desde o comezo ata a data límite" @@ -1953,7 +1971,7 @@ msgstr "Op." msgid "Pessimistic" msgstr "Pesimista" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:376 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:385 msgid "Limiting resource assignation" msgstr "Asignación de recursos limitantes" @@ -1984,7 +2002,7 @@ msgstr "O nome do tipo de unidade non pode ser baleiro" msgid "Entity sequences" msgstr "Secuencias de entidade" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:91 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:92 #: libreplan-webapp/src/main/webapp/templates/_list.zul:28 msgid "Delay from beginning (days)" msgstr "Retraso desde o comezo (en días)" @@ -2014,7 +2032,7 @@ msgstr "Confirmar cancelación" msgid "Work And Progress Per Task" msgstr "Traballo e progreso por tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1519 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1523 msgid "project code already being used" msgstr "o código do proxecto xa está sendo usado" @@ -2033,8 +2051,8 @@ msgstr "Borrando secuencia" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:457 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:208 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:264 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:840 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:875 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:844 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:879 msgid "Error on showing removing element: " msgstr "Erro ao mostrar o elemento a borrar: " @@ -2095,7 +2113,7 @@ msgid "Overload" msgstr "Sobrecarga" #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:30 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:68 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:69 msgid "Assignment log" msgstr "Histórico de asignacións" @@ -2104,10 +2122,6 @@ msgstr "Histórico de asignacións" msgid "Work Report Models" msgstr "Modelos de partes de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyCaptTimeout.java:45 -msgid "CutycaptTimeout thread exception" -msgstr "Excepción no thread CutycaptTimeout" - #: libreplan-webapp/src/main/webapp/materials/materials.zul:73 msgid "New" msgstr "Novo" @@ -2116,7 +2130,7 @@ msgstr "Novo" msgid "Date last progress measurement" msgstr "Data da última medida de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:103 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:112 msgid "Deadline (days since beggining project)" msgstr "Data límite (días desde o inicio do proxecto)" @@ -2146,14 +2160,14 @@ msgstr "o nome de tipo de criterio está sendo usado" msgid "Task code cannot be null" msgstr "O código da tarefa non pode ser nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:520 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:302 +msgid "Derived of calendar {0}" +msgstr "Derivado do calendario {0}" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:517 msgid "It is not allowed to consolidate progress." msgstr "Non se pode borrar progreso consolidado." -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32 -msgid "Create Task" -msgstr "Crear tarefa" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27 msgid "External company" msgstr "Empresa externa" @@ -2162,10 +2176,10 @@ msgstr "Empresa externa" #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:60 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:61 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:27 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:107 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:140 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:108 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:129 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68 msgid "Actions" @@ -2238,11 +2252,15 @@ msgstr "O valor non é válido.\n o código no pode conter caracteres como '_'." msgid "Hours Group" msgstr "Grupo de horas" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1029 +msgid "Budget: {0}€, Consumed: {1}€ ({2}%)" +msgstr "Orzamento: {0}€, Consumido: {1}€ ({2}%)" + #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:825 msgid "Unallocated name" msgstr "Nome no asignado" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:924 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1041 msgid "Move up" msgstr "Mover arriba" @@ -2256,7 +2274,7 @@ msgstr "Data de comunicación da subcontratación" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:131 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:134 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:281 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:301 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:269 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:367 msgid "Scheduling" @@ -2292,17 +2310,17 @@ msgstr "Páxina arriba" msgid "Create new project" msgstr "Crear novo proxecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:954 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1026 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:161 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:165 #: libreplan-webapp/src/main/webapp/orders/_list.zul:35 msgid "State" msgstr "Estado" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:80 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:90 msgid "Must start after" msgstr "Debe empezar despois" @@ -2310,7 +2328,7 @@ msgstr "Debe empezar despois" msgid "Confirm change" msgstr "Confirmar cambio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:845 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:849 msgid "You don't have permissions to edit this project" msgstr "Non ten permisos para editar este proxecto" @@ -2349,7 +2367,7 @@ msgstr "LibrePlan: Materiais" msgid "New task" msgstr "Nova tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:191 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:197 msgid "The password for a new user cannot be empty" msgstr "O contrasinal non pode ser baleiro para un usuario novo" @@ -2401,7 +2419,7 @@ msgstr "Detalles persoais" msgid "Workers List" msgstr "Lista de traballadores" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:355 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:375 msgid "Delete project template. Are you sure?" msgstr "Borrar modelo de proxecto. ¿Está seguro?" @@ -2482,18 +2500,18 @@ msgstr "Outros proxectos" msgid "Tasks input buffer" msgstr "Buffer de tarefas de entrada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:168 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:173 msgid "At least one {0} sequence must be active" msgstr "Polo menos unha secuencia de {0} debe estar activa" #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:26 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:139 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 msgid "Profile name" msgstr "Nome do perfil" -#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java:252 +#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java:246 msgid "Could open generated PDF" msgstr "Non se puido abrir o PDF xerado" @@ -2505,7 +2523,7 @@ msgstr "Deshabilitar borrado" msgid "You should select a source scenario" msgstr "Debe seleccionar un escenario de orixe" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:163 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:168 msgid "At least one {0} sequence is needed" msgstr "Necesítase polo menos unha secuencia de {0}" @@ -2540,18 +2558,18 @@ msgid "" "to generate usage statistics" msgstr "Marca esta opción para enviar información aos desenvolvedores de LibrePlan para xerar estatísticas de uso" -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:36 -msgid "More options" -msgstr "Máis opcións" +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesModel.java:219 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java:179 +msgid "Error: {0}" +msgstr "Erro: {0}" #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 msgid "Communication" msgstr "Comunicación" -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesModel.java:219 -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java:179 -msgid "Error: {0}" -msgstr "Erro: {0}" +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:36 +msgid "More options" +msgstr "Máis opcións" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:240 msgid "Confirm create template" @@ -2583,7 +2601,7 @@ msgstr "LibrePlan: Traballo e progreso por tarefa" msgid "Projects" msgstr "Proxectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1102 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1128 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:269 msgid "Confirm exit dialog" msgstr "Diálogo para confirmar a salida" @@ -2661,7 +2679,7 @@ msgstr "Rexistro de traballo" msgid "Output format" msgstr "Formato de saída" -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:47 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:49 msgid "Print" msgstr "Imprimir" @@ -2681,8 +2699,8 @@ msgstr "o tipo de recurso non permite criterios habilitados" msgid "Effort cannot be null" msgstr "O esforzo non pode ser nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1093 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:52 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1119 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:126 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106 @@ -2694,16 +2712,16 @@ msgstr "O esforzo non pode ser nulo" #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:80 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:137 -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:48 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:50 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:81 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:50 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:91 #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42 #: libreplan-webapp/src/main/webapp/planner/order.zul:131 #: libreplan-webapp/src/main/webapp/planner/order.zul:166 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:85 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:166 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:139 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:74 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:147 #: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:58 #: libreplan-webapp/src/main/webapp/calendars/calendars.zul:47 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:103 @@ -2739,8 +2757,8 @@ msgid "Machines List" msgstr "Lista de máquinas" #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:320 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:692 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:904 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:696 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:908 msgid "You don't have read access to this project" msgstr "Non ten acceso de lectura a este proxecto" @@ -2816,7 +2834,7 @@ msgstr "{0} (máx: {1})" msgid "Cost Category" msgstr "Categoría de custo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:471 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:473 msgid "end" msgstr "fin" @@ -2837,7 +2855,7 @@ msgstr "Autorizacións" msgid "Continue" msgstr "Continuar" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementController.java:121 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementController.java:122 msgid "Edit task {0}" msgstr "Editar tarefa: {0}" @@ -2870,7 +2888,7 @@ msgstr "Valor máximo por defecto" msgid "Add criterion requirement" msgstr "Engadir criterio requirido" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:860 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:864 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 " @@ -2910,7 +2928,7 @@ msgstr "LibrePlan: Cambiar o contrasinal" msgid "please, select a label" msgstr "por favor, seleccione unha etiqueta" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:134 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:123 msgid "Add profile" msgstr "Engadir perfil" @@ -2989,8 +3007,8 @@ msgstr "o nome non pode ser baleiro" msgid "Disabled" msgstr "Deshabilitado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:738 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:325 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:764 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:322 msgid "Earned value" msgstr "Valor gañado" @@ -3019,8 +3037,8 @@ msgid "" "Please save your project before proceeding." msgstr "Os modelos só poden ser creados a partir de tarefas existentes. Está tentando crear un modelo a partir dunha tarefa nova.\nPor favor garde o seu proxecto antes de continuar." -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1163 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1178 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1243 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1258 msgid "{0} not supported yet" msgstr "{0} aínda non soportado" @@ -3042,7 +3060,7 @@ msgstr "Entrada nova" msgid "Resources Load" msgstr "Carga de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:220 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:225 msgid "Some sequences to remove not existed" msgstr "Algunhas secuencias para borrar non existen" @@ -3117,11 +3135,11 @@ msgid "Select start date" msgstr "Seleccionar data de inicio" #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:106 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:152 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:157 msgid "Error on showing warning message removing typeOfWorkHours: " msgstr "Erro ao mostrar mensaxe de advertencia borrando tipo de horas de traballo: " -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:882 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:886 msgid "Removed {0}" msgstr "{0} borrado" @@ -3133,8 +3151,8 @@ msgstr "Confirmar o borrado deste traballador. ¿Está seguro?" msgid "Group name" msgstr "Nome do grupo" -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:59 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:106 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:60 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:107 msgid "Role name" msgstr "Nome do rol" @@ -3150,8 +3168,8 @@ msgstr "Crear parte de traballo" msgid "Value is not valid, the precision value must not be empty" msgstr "O valor non é válido, o valor de precisión non debe estar baleiro" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:863 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:473 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:889 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:470 msgid "h" msgstr "h" @@ -3176,7 +3194,7 @@ msgstr "Engadir fito" msgid "Assign selected items" msgstr "Asignar elementos seleccionados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:450 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:452 msgid "init" msgstr "inicio" @@ -3253,6 +3271,10 @@ msgstr "Cliente" msgid "Hours type" msgstr "Tipo de horas" +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:43 +msgid "Show money cost bar" +msgstr "Monstrar barra de coste monetario" + #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:156 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:211 msgid "criterion type name not specified" @@ -3266,11 +3288,11 @@ msgstr "Non se pode conectar ao servidor de LDAP" msgid "Add Exception" msgstr "Engadir excepción" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:220 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:222 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:202 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:223 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:247 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:378 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:379 msgid "cannot be empty" msgstr "non pode ser baleiro" @@ -3394,7 +3416,7 @@ msgstr "Opcións de exportación" #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:145 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:94 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:40 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:80 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:81 #: libreplan-webapp/src/main/webapp/templates/_list.zul:27 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:45 @@ -3463,7 +3485,7 @@ msgstr "Horas traballadas por recurso" msgid "The end date cannot be before the init date" msgstr "A data de fin non pode ser anterior á data de inicio" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:117 msgid "" "Profiles of LDAP users cannot be managed because LDAP roles are being used." msgstr "Os perfís dos usuarios de LDAP non se poden xestionar porque os roles de LDAP están sendo usados." @@ -3559,7 +3581,7 @@ msgstr "Grupo de traballadores virtuais" msgid "Changes saved" msgstr "Cambios gardados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1263 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1267 msgid "See scheduling" msgstr "Ver planificación" @@ -3588,7 +3610,7 @@ msgid "Work report saved" msgstr "Parte de traballo gardado" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractCommand.java:53 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:377 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:386 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:68 msgid "Subcontract" msgstr "Subcontratar" @@ -3624,10 +3646,6 @@ msgstr "non pode ser baleiro" msgid "April" msgstr "Abril" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:302 -msgid "Derived of Calendar " -msgstr "Derivado do calendario " - #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:22 msgid "Users List" msgstr "Lista de usuarios" @@ -3685,14 +3703,14 @@ msgstr "Filtrar formularios de calidade por" msgid "Unindent selected task" msgstr "Desindentar tarefa seleccionada" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:62 -msgid "Constraint" -msgstr "Restrición" - #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 msgid "Customer reference code" msgstr "Código de referencia do cliente" +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:66 +msgid "Constraint" +msgstr "Restrición" + #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150 msgid "Add New Label Type Field" msgstr "Engadir novo campo de tipo de etiqueta" @@ -3711,16 +3729,16 @@ msgstr "Referencia del cliente" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:146 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:311 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:321 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:693 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:846 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:896 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:905 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:932 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:697 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:850 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:900 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:909 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:936 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 msgid "Information" msgstr "Información" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:931 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:935 msgid "Sorry, you do not have permissions to access this project" msgstr "Sentímolo, non ten permisos para acceder a este proxecto" @@ -3744,7 +3762,7 @@ msgstr "novo grupo de horas " msgid "Assign element to queue manually" msgstr "Asignar elemento á cola manualmente" -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:47 msgid "Please remember that only saved changes will be printed" msgstr "Por favor lembra que só os cambios gardados serán impresos" @@ -3789,6 +3807,10 @@ msgstr "Tipo de excepción de calendario non atopado" msgid "Unable to convert value to {0} type" msgstr "No se puido convertir o valor a tipo {0}" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:81 +msgid "Total task budget" +msgstr "Orzamento total da tarefa" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:222 msgid "Worker must be not-null" msgstr "O traballador non debe ser nulo" @@ -3797,14 +3819,14 @@ msgstr "O traballador non debe ser nulo" msgid "Some criterion satisfactions overlap in time" msgstr "Algúns criterios satisfeitos solápanse no tempo" -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 -msgid "LibrePlan: Materials Needs At Date" -msgstr "LibrePlan: Necesidades de materiais en data" - #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:49 msgid "Value last progress measurement" msgstr "Valor da última medida de progreso" +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 +msgid "LibrePlan: Materials Needs At Date" +msgstr "LibrePlan: Necesidades de materiais en data" + #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44 msgid "Worker assignments" msgstr "Asignacións de traballador" @@ -4033,7 +4055,7 @@ msgid "Check consolidated progresses" msgstr "Marcar progresos consolidados" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1469 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:585 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:587 msgid "Show all" msgstr "Mostrar todo" @@ -4051,7 +4073,7 @@ msgid "Apply tab changes" msgstr "Aplicar cambios da pestana" #: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:99 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:170 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:176 msgid "passwords don't match" msgstr "os contrasinais non coinciden" @@ -4171,7 +4193,7 @@ msgstr "Non indentable" msgid "List of materials for all categories (select one to filter)" msgstr "Lista de materiais paa tódalas categorías (seleccione unha para filtrar)" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:69 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:73 msgid "Resource allocation type" msgstr "Tipo de asignación de recursos" @@ -4188,7 +4210,7 @@ msgstr "Tipo de excepción" msgid "In the available periods {0} only {1} hours are available." msgstr "Nos períodos dispoñibles {0} só hai dispoñibles {1} horas." -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:126 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:115 msgid "Association with profiles" msgstr "Asociación con perfís" @@ -4230,7 +4252,7 @@ msgstr "Base" msgid "Total dedication" msgstr "Dedicación total" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:683 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:686 msgid "" "You can not remove the task \"{0}\" because of this or any of its children " "are already in use in some work reports" @@ -4431,8 +4453,8 @@ msgstr "Habilitar/Deshabilitar a advertencia sobre novas versións de LibrePlan msgid "Select type" msgstr "Seleccione tipo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:950 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:679 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1021 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:685 msgid "Hours invested" msgstr "Horas invertidas" @@ -4502,7 +4524,7 @@ msgstr "Vista da compañía" msgid "Both" msgstr "Ambos" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:765 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:882 msgid "Not editable for containing more that an hours group." msgstr "Non editable por conter máis dun grupo de horas." @@ -4576,6 +4598,7 @@ msgid "LibrePlan: Transfer Projects Between Scenarios" msgstr "LibrePlan: Transferir proxectos entre escenarios" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:118 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:166 msgid "%" msgstr "%" @@ -4586,14 +4609,14 @@ msgstr "Borrar calendario" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1536 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1700 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:336 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:273 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:338 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:274 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:141 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:633 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:425 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:257 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:670 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1328 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:673 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1332 msgid "must be lower than finish date" msgstr "debe ser anterior á data de fin" @@ -4614,14 +4637,14 @@ msgstr "Recurso" msgid "Total task hours" msgstr "Total de horas de tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/RedirectorSynthetiser.java:125 -msgid "Could not load any resource" -msgstr "Non se puido cargar un recurso" - #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:46 msgid "Date last progress reported" msgstr "Data último progreso notificado" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/RedirectorSynthetiser.java:125 +msgid "Could not load any resource" +msgstr "Non se puido cargar un recurso" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:37 msgid "Work And Progress Per Project" @@ -4684,7 +4707,7 @@ msgstr "Lista de liñas de parte de traballo" msgid "Unit type code cannot be empty" msgstr "O código de tipo de unidade non pode ser baleiro" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:183 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:189 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 msgid "Users" msgstr "Usuarios" @@ -4717,8 +4740,8 @@ msgid "" "completed." msgstr "Outro usuario modificou os mesmos datos, polo tanto a operación non se pode completar con seguridade." -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:218 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:232 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:223 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:244 msgid "Template saved" msgstr "Modelo gardado" @@ -4757,7 +4780,7 @@ msgstr "Saír da sesión" #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:31 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:53 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:67 -#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineGroupTemplate.java:243 +#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineGroupTemplate.java:244 msgid "Group" msgstr "Grupo" @@ -4822,9 +4845,9 @@ msgstr "Actualización incompatible: i recurso almacenado non é de tipo: {0}" #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:78 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:134 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:83 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:164 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:137 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:72 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:145 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:114 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:100 #: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:92 @@ -4892,7 +4915,7 @@ msgstr "Planificar dende a data límite ao principio" msgid "generic machines allocation" msgstr "asignación xenérica de máquinas" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:375 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:384 msgid "Non limiting resource assignation" msgstr "Asignación de recursos non limitantes" @@ -4915,13 +4938,13 @@ msgstr "Administración" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1519 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1682 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:317 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:255 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:319 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:256 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:616 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:240 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:652 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1311 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:655 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1315 msgid "must be greater than start date" msgstr "debe ser maior que a data de inicio" @@ -4934,6 +4957,10 @@ msgstr "Cancelar e volver" msgid "Assign quality form" msgstr "Asignar formulario de calidade" +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:157 +msgid "Calculated budget" +msgstr "Orzamento calculado" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:387 msgid "Delete item {0}. Are you sure?" msgstr "Borrar elemento {0}. ¿Está seguro?" @@ -4959,6 +4986,10 @@ msgstr "unha liña de parte de traballo non ten este tipo de etiqueta asignado" msgid "Allocations" msgstr "Asignacións" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:137 +msgid "Choosing Template" +msgstr "Elixindo modelo" + #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:66 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 msgid "Capacity" @@ -5003,7 +5034,7 @@ msgstr "Non se fixeron asignacións" msgid "Removed calendar \"{0}\"" msgstr "Borrado calendario \"{0}\"" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1068 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1072 msgid "Create project" msgstr "Crear proxecto" @@ -5044,29 +5075,29 @@ msgstr "Non se engadiron esas actualizacións ao usuario {0} porque xa estaban p msgid "New work report" msgstr "Novo parte de traballo" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:305 +msgid "Root calendar" +msgstr "Calendario raíz" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:847 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578 msgid "yes" msgstr "si" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:305 -msgid "Root calendar" -msgstr "Calendario raíz" - -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:867 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:871 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?" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:278 -msgid "Port" -msgstr "Porto" - #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:113 msgid "Select gap" msgstr "Seleccionar intervalo" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:278 +msgid "Port" +msgstr "Porto" + #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:63 msgid "Date Finish" msgstr "Data de fin" @@ -5094,7 +5125,11 @@ msgstr "Asignación de categoría de custo" msgid "missing code in a hour cost" msgstr "falta código nun custo por hora" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:902 +#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:247 +msgid "Exception Day Type" +msgstr "Tipo de día de excepción" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:973 msgid "All workers" msgstr "Todos os traballadores" @@ -5118,14 +5153,16 @@ msgstr "Grupo de horas {0} : Clave duplicada en BD" #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:311 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:207 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:307 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:110 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:130 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:994 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1184 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1441 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:135 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:171 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:115 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1488 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1512 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1492 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1516 #: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:757 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:45 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:53 @@ -5192,10 +5229,6 @@ msgstr "Tipo de unidade" msgid "Load due to other assignments" msgstr "Carga debido a outras asignacións" -#: libreplan-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" - #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:554 msgid "This machine was already removed by other user" msgstr "Esta máquina xa foi borrada por outro usuario" @@ -5268,11 +5301,11 @@ msgstr "Nome de usuario da nosa empresa" msgid "Filter work reports" msgstr "Filtrar partes de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:947 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:678 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:601 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1018 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:684 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:603 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:328 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:63 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:64 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:48 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:46 @@ -5335,7 +5368,7 @@ msgstr "opcións" msgid "LibrePlan: Work Reports" msgstr "LibrePlan: Partes de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:373 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:393 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:393 msgid "Error on showing delete confirm" msgstr "Erro ao mostrar a confirmación de borrado" @@ -5360,7 +5393,7 @@ msgstr "Agrupar por semanas" msgid "Finish hour" msgstr "Hora de fin" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:200 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:196 msgid "Done {0} of {1}" msgstr "Feito {0} de {1}" @@ -5416,16 +5449,16 @@ msgstr "Esta medida de progreso non pode estar en " msgid "Inherited labels" msgstr "Etiquetas herdadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:946 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 -msgid "Unindent" -msgstr "Desindentar" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:939 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1406 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" +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1063 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 +msgid "Unindent" +msgstr "Desindentar" + #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:50 msgid "Direct labels" msgstr "Etiquetas directas" @@ -5489,7 +5522,7 @@ msgstr "O código da secuencia xa está en uso e non se pode actualizar." msgid "Scheduling state" msgstr "Estado de planificación" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:369 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:389 msgid "This template can not be removed because it has applications." msgstr "Este modelo non pode borrarse porque ten aplicacións." @@ -5509,6 +5542,10 @@ msgstr "LibrePlan: Horas traballadas por recurso" msgid "Number of iterations should be between 1 and " msgstr "O número de iteracións debe estar entre 1 e " +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:151 +msgid "Budget in money" +msgstr "Orzamento en diñeiro" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:145 msgid "Scenarios must be enabled as more elements than master exist" msgstr "Os escenarios deben estar habilitados xa que existen máis elementos que master" @@ -5551,7 +5588,7 @@ msgstr "Her" msgid "Administrator" msgstr "Administrador" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:190 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:186 msgid "Doing {0} reassignations" msgstr "Realizando {0} reasignacións" @@ -5587,7 +5624,7 @@ msgstr "Non se pode borrar o tipo de parte de traballo. Hai algún parte de trab msgid "Criterion Type List" msgstr "Lista de tipos de criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:739 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:765 msgid "Overall progress" msgstr "Progreso global" @@ -5611,7 +5648,7 @@ msgstr "Contrasinal" msgid "Observations" msgstr "Observacións" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:947 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:951 msgid "Edit project" msgstr "Editar proxecto" @@ -5666,7 +5703,6 @@ msgstr "Borrar {0} \"{1}\". ¿Está seguro?" msgid "Only {0} resources per day were achieved for current allocation" msgstr "Só se lograon {0} recursos por día para a asignación actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:51 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:79 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:48 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:89 @@ -5713,6 +5749,10 @@ msgstr "Completado: {0}% " msgid "Calculated progress measurement can not be removed" msgstr "As medidas de progreso calculadas non se poden borrar" +#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:252 +msgid "Exception Day Types" +msgstr "Tipos de día de excepción" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java:335 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java:341 msgid " The " @@ -5756,6 +5796,10 @@ msgstr "Aplicar cambios e continuar a edición" msgid "Infinitely Over Assignable" msgstr "Sobreasignable infinitamente" +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:157 +msgid "Money spent" +msgstr "Diñeiro gastado" + #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:426 msgid "criterion names must be unique inside a criterion type" msgstr "o nome do criterio debe ser único dentro dun tipo de criterio" @@ -5791,7 +5835,7 @@ msgstr "Os períodos dispoñibles dependen da satisfacción dos criterios polos #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:86 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:116 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:95 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:85 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:86 #: libreplan-webapp/src/main/webapp/templates/_list.zul:26 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:54 @@ -5848,15 +5892,20 @@ msgstr "Data de inicio" msgid "Update exception" msgstr "Actualizar excepción" -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 -msgid "Budget" -msgstr "Presuposto" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:253 msgid "Operation cannot be done" msgstr "Non se pode realizar a operación" +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:91 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:80 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:62 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:107 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 +#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:65 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 +msgid "Budget" +msgstr "Presuposto" + #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "May" msgstr "Maio" @@ -5890,7 +5939,7 @@ msgstr "Número de aplicacións" msgid "Assign element to queue automatically" msgstr "Asignar elemento á cola automáticamente" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:82 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:92 msgid "" "Date which the task must start after (press enter in textbox to open " "calendar popup or type in date directly)" @@ -5926,8 +5975,8 @@ msgstr "Este tipo de etiqueta xa está asignado ao tipo de parte de traballo." msgid "Probability %" msgstr "Probabilidade %" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:737 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:324 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:763 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:321 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:815 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49 msgid "Load" @@ -5938,12 +5987,12 @@ msgstr "Carga" msgid "New criterion" msgstr "Criterio novo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:683 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:689 #: libreplan-webapp/src/main/webapp/materials/materials.zul:81 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:43 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:49 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:101 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:102 #: libreplan-webapp/src/main/webapp/templates/_list.zul:32 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 @@ -5967,7 +6016,7 @@ msgstr "Nodo seleccionado" msgid "already exists an allocation for criteria {0}" msgstr "xa existe unha asignación para os criterios {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:283 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:303 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:294 msgid "Project Templates" msgstr "Modelos de proxectos" @@ -5994,7 +6043,7 @@ msgstr "Non asignado" msgid "At least one HoursGroup is needed" msgstr "É necesario alo menos un HoursGroup" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:178 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:184 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:74 #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:165 @@ -6058,8 +6107,8 @@ msgstr "Carga 100%" msgid "Function" msgstr "Función" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:799 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:363 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:825 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:360 msgid "date in future" msgstr "data no futuro" @@ -6074,14 +6123,14 @@ msgstr "data no futuro" msgid "Format" msgstr "Formato" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:887 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:885 msgid "New project version" msgstr "Nova versión de proxecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:77 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:79 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:366 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:484 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1231 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:486 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1235 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478 #: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:537 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:37 @@ -6252,7 +6301,7 @@ msgstr "O valor non é válido, o valor debe ser maior có valor do progreso pre msgid "BCWS" msgstr "BCWS" -#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java:351 +#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java:343 msgid " in the specified directory." msgstr " no directorio especificado." @@ -6305,7 +6354,7 @@ msgstr "Custo de traballo realizado" msgid "Create project from Template" msgstr "Crear proxecto a partir de modelo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:418 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:420 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" @@ -6316,11 +6365,15 @@ msgstr "O valor non é válido.\n O código non pode conter caracteres como '_' msgid "an authorization type must be set" msgstr "Debe seleccionar un tipo de autorización" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:92 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:101 msgid "Must start after (days since beginning project)" msgstr "Debe empezar despois de (días desde o inicio do proxecto)" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:886 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:134 +msgid "Percentage of estimated budget in money / money spent" +msgstr "Porcentaxe de orzamento estimado / diñeiro gastado" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:884 msgid "" "Confirm creating a new project version for this scenario and derived. Are " "you sure?" @@ -6368,7 +6421,7 @@ msgstr "Deseleccionar" msgid "You should select the type of exception" msgstr "Debe seleccionar o tipo de excepción" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:93 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:103 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:63 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 @@ -6420,7 +6473,7 @@ msgstr "Asignación avanzada" msgid "Number of iterations" msgstr "Número de iteracións" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:60 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:61 msgid "Template Tree" msgstr "Árbore de modelos" @@ -6447,11 +6500,15 @@ msgstr "o esforzo non está ben calculado baseándose no reloxo" msgid "Status" msgstr "Estado" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:321 +msgid "from {0}" +msgstr "desde {0}" + #: libreplan-webapp/src/main/webapp/settings/settings.zul:111 msgid "Resource load view" msgstr "Vista de carga de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:787 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:813 msgid "the date must be inside the visualization area" msgstr "a data debe estar dentro da área de visualización" @@ -6601,8 +6658,8 @@ msgid "Task Scheduling Status In Project" msgstr "Estado de planificación de tarefas en proxecto" #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:162 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:356 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:868 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:376 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:872 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313 msgid "Confirm" msgstr "Confirmar" @@ -6654,8 +6711,8 @@ msgstr "Prezo total" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1214 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:346 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:984 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:990 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1101 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1107 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:289 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 @@ -6674,7 +6731,7 @@ msgstr "Prezo total" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:201 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:333 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:406 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1247 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1251 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:49 @@ -6699,10 +6756,8 @@ msgstr "Prezo total" #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:154 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:106 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:46 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:68 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:40 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:115 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:148 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:137 #: libreplan-webapp/src/main/webapp/templates/_list.zul:53 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52 @@ -6802,7 +6857,7 @@ msgid "Stretches" msgstr "Tramos" #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:79 -msgid "Interporlation" +msgid "Interpolation" msgstr "Interpolación" #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:80 @@ -6866,23 +6921,23 @@ msgstr "En progreso" msgid "Blocked" msgstr "Bloqueado" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:29 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:31 msgid "as soon as possible" msgstr "tan pronto como sexa posible" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:41 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:38 msgid "start not earlier than" msgstr "empezar non antes de" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:53 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:45 msgid "start in fixed date" msgstr "comezar en data fixa" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:65 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:57 msgid "as late as possible" msgstr "tan tarde como sexa posible" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:77 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:64 msgid "finish not later than" msgstr "acabar non despois de" @@ -6922,7 +6977,7 @@ msgstr "Permiso de edición para todos os proxectos" msgid "Project creation allowed" msgstr "Permiso de creación de proxectos" -#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:122 +#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:132 msgid "Line" msgstr "Liña" @@ -7090,23 +7145,23 @@ msgstr "P" msgid "U" msgstr "S" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:618 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:629 msgid "" "Some ancestor has the same label assigned, so this element is already " "inheriting this label" msgstr "Algún ancestro ten a misma etiqueta asignada, polo que este elemento xa está herdando esa etiqueta" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:717 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:728 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:963 msgid "Cannot spread two progress in the same task" msgstr "Non poden propagar dous progresos na mesma tarefa" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:741 -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:767 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:752 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:778 msgid "Duplicate Progress Assignment For Task" msgstr "Asignación de progreso duplicada para a tarefa" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1094 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1105 msgid "Quality form already exists" msgstr "O formulario de calidade xa existe"