From 069066b73c662d8c1be354452dbce2611ffb242a Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Fri, 4 May 2012 13:29:51 +0200 Subject: [PATCH] i18n: Update Spanish and Galician translations FEA: ItEr76S03Community --- .../src/main/resources/i18n/es.po | 383 +++++++++--------- .../src/main/resources/i18n/gl.po | 383 +++++++++--------- 2 files changed, 396 insertions(+), 370 deletions(-) diff --git a/libreplan-webapp/src/main/resources/i18n/es.po b/libreplan-webapp/src/main/resources/i18n/es.po index 5eba0560d..a1b65ec47 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: libreplan-1.2.3\n" +"Project-Id-Version: libreplan-1.2.4\n" "Report-Msgid-Bugs-To: http://bugs.libreplan.org/\n" -"POT-Creation-Date: 2012-04-11 08:32+0200\n" -"PO-Revision-Date: 2012-04-11 08:35+0000\n" +"POT-Creation-Date: 2012-05-04 13:15+0200\n" +"PO-Revision-Date: 2012-05-04 11:18+0000\n" "Last-Translator: Manuel Rego Casasnovas \n" "Language-Team: Español\n" "MIME-Version: 1.0\n" @@ -26,7 +26,7 @@ msgstr "" msgid "The resource cannot be null" msgstr "El recurso no puede ser nulo" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:354 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:338 msgid "Group path" msgstr "Path del grupo" @@ -126,7 +126,7 @@ msgstr "Crear trabajador virtual" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:57 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:226 msgid "Operations" msgstr "Operaciones" @@ -170,7 +170,7 @@ msgid "Description cannot be null or empty" msgstr "La descripción no puede ser nula o vacía" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:72 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:269 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:270 msgid "MonteCarlo Method" msgstr "Método de Montecarlo" @@ -219,7 +219,7 @@ msgstr "Crear tarea" msgid "LibrePlan: Advanced allocation" msgstr "LibrePlan: Asignación avanzada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:177 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:172 msgid "The {0} sequence prefixes can not be repeated" msgstr "Los prefijos de secuencia de {0} no pueden repetirse" @@ -306,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:899 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:935 msgid "The project has no scheduled elements" msgstr "El proyecto no tiene elementos planificados" @@ -384,7 +384,7 @@ msgstr "Haz click en este" msgid "Project Name" msgstr "Nombre del proyecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1084 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1100 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306 msgid "Indent" msgstr "Indentar" @@ -393,7 +393,7 @@ msgstr "Indentar" msgid "Reassignation" msgstr "Reasignación" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:327 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:311 msgid "Save passwords in database" msgstr "Guardar contraseñas en la base de datos" @@ -431,7 +431,7 @@ msgstr "Nuevo elemento del formulario de calidad" msgid "LibrePlan: Labels" msgstr "LibrePlan: Etiquetas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:261 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:252 msgid "LDAP connection was successful" msgstr "La conexión con el LDAP se ha realizado con éxito" @@ -512,6 +512,10 @@ msgstr "un recurso deshabilitado tiene subrecursos habilitados" msgid "Client" msgstr "Cliente" +#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:632 +msgid "Hours Group {0}: Duplicate code in DB" +msgstr "Grupo de horas {0}: Código duplicado en BD" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:153 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:662 msgid "" @@ -519,7 +523,7 @@ msgid "" " can't be added" msgstr "no hay recursos con los criterios solicitados: {0}. Por tanto, no se puede añadir la asignación genérica" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:347 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:331 msgid "Role search strategy" msgstr "Estrategia para la búsqueda de roles" @@ -577,7 +581,7 @@ msgid "" "criterionSatisfaction from the same criterionType" msgstr "{0} no es válido, criterionType se solapa con otro criterionSatisfaction del mismo criterionType" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:349 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:333 msgid "Group strategy" msgstr "Estrategia de grupo" @@ -613,7 +617,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:836 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:872 msgid "Confirm deleting {0}. Are you sure?" msgstr "Confirmar el borrado de {0}. ¿Está seguro?" @@ -647,7 +651,7 @@ msgstr "Limitante" msgid "Required materials" msgstr "Materiales requeridos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:346 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:348 msgid "Backwards" msgstr "Atrás" @@ -740,7 +744,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:596 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:598 #: 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 @@ -817,7 +821,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:1193 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1217 msgid "Modified" msgstr "Modificado" @@ -829,7 +833,7 @@ msgstr "Añadir criterio" msgid "You can not remove the current scenario" msgstr "No se puede borrar el escenario actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:672 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:655 msgid "format prefix invalid. It cannot be empty or contain whitespaces." msgstr "formato de prefijo inválido. No puede estar vacío o contener espacios en blanco." @@ -866,7 +870,7 @@ msgstr "Lista de plantillas" msgid "Subcontracted Tasks List" msgstr "Lista de tareas subcontratadas" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:240 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:224 msgid "Last value" msgstr "Último valor" @@ -900,7 +904,7 @@ msgstr "Perfil" msgid "Materials Needs At Date" msgstr "Necesidades de materiales en fecha" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:292 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:276 msgid "UserDn" msgstr "UserDn" @@ -967,12 +971,12 @@ msgstr "¿Está seguro de cambiar el tipo de recurso? Los criterios con diferent msgid "This Criterion has already been added." msgstr "Este criterio ya ha sido añadido." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:222 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:206 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/java/org/libreplan/web/tree/TreeController.java:876 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:112 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:69 msgid "Budget value cannot be negative" msgstr "El valor del presupuesto no puede ser negativo" @@ -1090,7 +1094,7 @@ msgstr "Datos del tipo" msgid "Profiles" msgstr "Perfiles" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:271 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:255 msgid "Host" msgstr "Host" @@ -1200,8 +1204,8 @@ msgstr "URL del logo de la empresa" msgid "No worker selected" msgstr "Ningún trabajador seleccionado" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:220 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:238 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:204 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:222 msgid "Number of digits" msgstr "Número de dígitos" @@ -1231,10 +1235,10 @@ 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: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/planner/TaskElementAdapter.java:1006 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:241 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:697 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:585 #: 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:65 @@ -1363,7 +1367,7 @@ msgstr "a" msgid "worker's first name not specified" msgstr "nombre del trabajador no especificado" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:350 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:334 msgid "Property strategy" msgstr "Estrategia de propiedad" @@ -1416,7 +1420,7 @@ msgstr "Tipo de progreso" msgid "Task contains consolidated progress. Cannot apply sigmoid function." msgstr "La tarea contiene progreso consolidado. No se puede aplicar la función sigmoide." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:320 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:304 msgid "UserId" msgstr "UserId" @@ -1443,10 +1447,6 @@ msgstr "Crear proyecto nuevo" msgid "Stretches list" msgstr "Lista de tramos" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:193 -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}" @@ -1473,7 +1473,7 @@ msgstr "Zoom" #: libreplan-webapp/src/main/webapp/settings/settings.zul:124 #: 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/templates/templates.zul:144 #: 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 @@ -1483,7 +1483,7 @@ msgstr "Zoom" #: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:90 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:48 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:395 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:379 msgid "Save" msgstr "Guardar" @@ -1496,9 +1496,9 @@ msgstr "Esfuerzo estándar" msgid "Material categories" msgstr "Categorías de materiales" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:595 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:693 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:283 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:578 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:676 msgid "number of digits must be between {0} and {1}" msgstr "el número de dígitos debe estar entre {0} y {1}" @@ -1528,12 +1528,12 @@ msgstr "Autorización de usuarios" msgid "Problems connecting with subcontractor web service" msgstr "Problemas conectando con el servicio web subcontratista" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:232 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:216 msgid "Entity type" msgstr "Tipo de entidad" #: 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 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:270 msgid "Unsaved changes will be lost. Are you sure?" msgstr "Se perderán los cambios sin guardar. ¿Está seguro?" @@ -1587,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:1017 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:984 msgid "Name: {0}" msgstr "Nombre: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1020 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1036 msgid "Move down" msgstr "Mover abajo" @@ -1638,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:1282 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1318 msgid "Create Template" msgstr "Crear plantilla" @@ -1811,7 +1811,7 @@ msgstr "Añadir a partir de plantilla" msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "Los recursos asignados para esta tarea serán borrados. ¿Está seguro?" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:670 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:653 msgid "" "format prefix invalid. It cannot be empty or contain '_' or whitespaces." msgstr "formato de prefijo inválido. No puede estar vacío o contener '_' o espacios en blanco." @@ -1838,11 +1838,11 @@ msgstr "El código no es válido. Hay otro tipo de unidad con el mismo código" msgid "July" msgstr "Julio" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:255 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:239 msgid "Enable LDAP authentication" msgstr "Habilitar la autenticación LDAP" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:490 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:488 msgid "( max: {0} )" msgstr "( máx: {0} )" @@ -1863,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:1499 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1535 msgid "project name already being used" msgstr "el nombre de proyecto ya está siendo usado" @@ -1880,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:519 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:517 msgid "There are not any assigned progress to current task" msgstr "No hay ningún progreso asignado a la tarea actual" @@ -1909,7 +1909,7 @@ msgstr "Abajo" msgid "Label" msgstr "Etiqueta" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:987 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1003 msgid "Value is not valid, taking into account the current list of HoursGroup" msgstr "El valor no es válido, teniendo en cuenta la lista actual de grupos de horas" @@ -1939,7 +1939,7 @@ msgstr "Grupo de horas" msgid "LibrePlan: Accounts" msgstr "LibrePlan: Cuentas" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:97 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:98 #: 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" @@ -2003,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:92 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:93 #: libreplan-webapp/src/main/webapp/templates/_list.zul:28 msgid "Delay from beginning (days)" msgstr "Retraso desde el comienzo (en días)" @@ -2016,7 +2016,7 @@ msgstr "El recurso no puede ser nulo" msgid "Total Hours" msgstr "Horas totales" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:385 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:369 msgid "LibrePlan Role" msgstr "Rol LibrePlan" @@ -2033,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:1523 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1559 msgid "project code already being used" msgstr "el código del proyecto ya está siendo usado" @@ -2041,7 +2041,7 @@ msgstr "el código del proyecto ya está siendo usado" msgid "WBS (tasks)" msgstr "EDT (tareas)" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:720 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:703 msgid "Deleting sequence" msgstr "Borrando secuencia" @@ -2052,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:844 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:879 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:880 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:915 msgid "Error on showing removing element: " msgstr "Error al mostrar el elemento a borrar: " @@ -2165,7 +2165,7 @@ msgstr "El código de la tarea no puede ser nulo" msgid "Derived of calendar {0}" msgstr "Derivado del calendario {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:517 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:515 msgid "It is not allowed to consolidate progress." msgstr "No se permite consolidar progreso." @@ -2253,7 +2253,7 @@ 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 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:996 msgid "Budget: {0}€, Consumed: {1}€ ({2}%)" msgstr "Presupuesto: {0}€, Consumido: {1}€ ({2}%)" @@ -2261,7 +2261,7 @@ msgstr "Presupuesto: {0}€, Consumido: {1}€ ({2}%)" msgid "Unallocated name" msgstr "Nombre no asignado" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1041 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1057 msgid "Move up" msgstr "Mover arriba" @@ -2311,7 +2311,7 @@ msgstr "Página arriba" msgid "Create new project" msgstr "Crear nuevo proyecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1026 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:993 #: 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 @@ -2329,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:849 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:885 msgid "You don't have permissions to edit this project" msgstr "No tiene permisos para editar este proyecto" @@ -2455,7 +2455,7 @@ msgstr "nombre del criterio no especificado" msgid "Value is not valid, the default max value must not be empty " msgstr "El valor no es válido, el valor máximo por defecto no debe ser nulo " -#: libreplan-webapp/src/main/webapp/common/configuration.zul:362 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:346 msgid "Role property" msgstr "Propiedad del rol" @@ -2476,7 +2476,7 @@ msgstr "Autorizar" msgid "Recommended allocation" msgstr "Asignación recomendada" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:254 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:238 msgid "Activation" msgstr "Activación" @@ -2493,7 +2493,7 @@ msgstr "Materiales guardados" msgid "Total Worked Hours By Resource In A Month" msgstr "Total horas trabajadas por recurso en un mes" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:672 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:671 msgid "Other projects" msgstr "Otros proyectos" @@ -2501,7 +2501,7 @@ msgstr "Otros proyectos" msgid "Tasks input buffer" msgstr "Buffer de tareas de entrada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:173 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:168 msgid "At least one {0} sequence must be active" msgstr "Al menos una secuencia de {0} debe estar activa" @@ -2524,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:168 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:163 msgid "At least one {0} sequence is needed" msgstr "Se necesita al menos una secuencia de {0}" @@ -2541,7 +2541,7 @@ msgstr "LibrePlan: Categorías de coste" msgid "Assigned" msgstr "Asignado" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:257 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:241 msgid "Use LDAP roles" msgstr "Usar roles del LDAP" @@ -2603,7 +2603,7 @@ msgid "Projects" msgstr "Proyectos" #: 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 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:271 msgid "Confirm exit dialog" msgstr "Diálogo para confirmar la salida" @@ -2722,7 +2722,7 @@ msgstr "El esfuerzo no puede ser nulo" #: libreplan-webapp/src/main/webapp/planner/order.zul:166 #: 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/templates/templates.zul:148 #: 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 @@ -2733,7 +2733,7 @@ msgstr "El esfuerzo no puede ser nulo" #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:129 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:100 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:398 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:382 msgid "Cancel" msgstr "Cancelar" @@ -2758,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:696 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:908 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:732 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:944 msgid "You don't have read access to this project" msgstr "No tiene acceso de lectura a este proyecto" @@ -2835,11 +2835,11 @@ msgstr "{0} (máx: {1})" msgid "Cost Category" msgstr "Categoría de coste" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:473 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:475 msgid "end" msgstr "fin" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:369 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:353 msgid "Role search query" msgstr "Consulta para la búsqueda de roles" @@ -2889,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:864 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:900 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 " @@ -2969,7 +2969,7 @@ msgstr "Nombre de la tarea" msgid "cost assignment's resource not specified" msgstr "recurso de la asignación de coste no especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:129 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:131 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45 @@ -2978,6 +2978,12 @@ msgstr "recurso de la asignación de coste no especificado" msgid "Project" msgstr "Proyecto" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:407 +msgid "" +"Starting date cannot be empty because there is a task with constraint \"as " +"soon as possible\"" +msgstr "La fecha de inicio no puede estar vacía porque hay una tarea con la restricción \"tan pronto como sea posible\"" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/TwoWaySelector.java:79 msgid "Unassigned" msgstr "No asignado" @@ -3038,8 +3044,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:1243 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1258 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1210 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1225 msgid "{0} not supported yet" msgstr "{0} aún no soportado" @@ -3061,11 +3067,11 @@ msgstr "Entrada nueva" msgid "Resources Load" msgstr "Carga de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:225 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:220 msgid "Some sequences to remove not existed" msgstr "Algunas secuencias para borrar no existen" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:233 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:224 msgid "Changes have been canceled" msgstr "Cambios cancelados" @@ -3073,7 +3079,7 @@ msgstr "Cambios cancelados" msgid "LibrePlan: Hours Worked Per Worker In A Month" msgstr "LibrePlan: Horas trabajadas por trabajador en un mes" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:312 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:296 msgid "Authentication" msgstr "Autenticación" @@ -3140,7 +3146,7 @@ msgstr "Seleccionar fecha de inicio" 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:886 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:922 msgid "Removed {0}" msgstr "{0} borrado" @@ -3195,7 +3201,7 @@ msgstr "Añadir hito" msgid "Assign selected items" msgstr "Asignar elementos seleccionados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:452 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:454 msgid "init" msgstr "inicio" @@ -3237,7 +3243,7 @@ msgstr "Consolidado" msgid "Work report types" msgstr "Tipos de partes de trabajo" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:187 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:180 msgid "MonteCarlo method" msgstr "Método de Montecarlo" @@ -3281,7 +3287,7 @@ msgstr "Monstrar barra de coste monetario" msgid "criterion type name not specified" msgstr "nombre del tipo de criterio no especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:265 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:256 msgid "Cannot connect to LDAP server" msgstr "No se puede conectar al servidor de LDAP" @@ -3318,10 +3324,6 @@ msgstr "Campos de cabecera" msgid "Progress type" msgstr "Tipo de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:581 -msgid "Task {0} : Project is incompatible type with {1}" -msgstr "Tarea {0} : El proyecto tiene un tipo incompatible con {1}" - #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:155 msgid "" "Time period contains non valid data. Ending data must be older than starting" @@ -3340,6 +3342,10 @@ msgstr "La contraseña de la cuenta de admin sigue siendo la contraseña por def msgid "Save Project" msgstr "Guardar proyecto" +#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:581 +msgid "Task {0}: Project is incompatible type with {1}" +msgstr "Tarea {0}: El proyecto tiene un tipo incompatible con {1}" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:318 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:324 msgid "Day is not valid" @@ -3578,11 +3584,11 @@ msgstr "Asignación: [{0},{1}]" msgid "Virtual Workers Group" msgstr "Grupo de trabajadores virtuales" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:217 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:208 msgid "Changes saved" msgstr "Cambios guardados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1267 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1303 msgid "See scheduling" msgstr "Ver planificación" @@ -3670,7 +3676,7 @@ msgstr "Tipos de progreso" msgid "Cost category" msgstr "Categoría de coste" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:719 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:702 msgid "It can not be deleted. At least one sequence is necessary." msgstr "No se puede borrar. Al menos una secuencia es necesaria." @@ -3712,6 +3718,12 @@ msgstr "Código de referencia del cliente" msgid "Constraint" msgstr "Restricción" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:426 +msgid "" +"Deadline cannot be empty because there is a task with constraint \"as late " +"as possible\"" +msgstr "La fecha de fin no puede estar vacía porque ha una tarea con la restricción \"tan tarde como sea posible\"" + #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150 msgid "Add New Label Type Field" msgstr "Añadir nuevo campo de tipo de etiqueta" @@ -3725,21 +3737,21 @@ msgid "Customer reference" msgstr "Referencia de cliente" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:326 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:360 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:365 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 #: 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: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:733 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:886 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:936 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:945 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:972 #: 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:935 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:971 msgid "Sorry, you do not have permissions to access this project" msgstr "Lo sentimos, no tiene permisos para acceder a este proyecto" @@ -3889,7 +3901,7 @@ msgid "" "{0}" msgstr "Error guardando un proyecto\n{0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:358 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:363 msgid "" "The task has got progress consolidations. It must delete all consolidations " "to change the resource allocation type " @@ -3969,7 +3981,7 @@ msgstr "Recurso limitante" msgid "Task Information" msgstr "Información de la tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:142 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:144 msgid "Hours Group at " msgstr "Grupo de horas en " @@ -4037,7 +4049,7 @@ msgstr "Invalidar" msgid "Budget hours" msgstr "Horas del presupuesto" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:150 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:151 msgid "Edit task: {0}" msgstr "Editar tarea: {0}" @@ -4122,7 +4134,7 @@ msgstr "Notificar progreso" msgid "Show dependencies" msgstr "Mostrar dependencias" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:346 msgid "Schedule from start to deadline" msgstr "Planificar desde el principio a la fecha límite" @@ -4215,10 +4227,6 @@ msgstr "En los períodos disponibles {0} solo {1} horas están disponibles." msgid "Association with profiles" msgstr "Asociación con perfiles" -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:627 -msgid "Task {0} : Duplicate code in DB" -msgstr "Tarea {0} : Código duplicado en BD" - #: libreplan-webapp/src/main/webapp/common/error.zul:30 #: libreplan-webapp/src/main/webapp/common/event_error.zul:25 msgid "Message - {0}" @@ -4245,7 +4253,7 @@ msgstr "Preferencias de la aplicación" msgid "Average of estimated hours" msgstr "Media de horas estimadas" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:285 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:269 msgid "Base" msgstr "Base" @@ -4253,7 +4261,7 @@ msgstr "Base" msgid "Total dedication" msgstr "Dedicación total" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:686 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:689 msgid "" "You can not remove the task \"{0}\" because of this or any of its children " "are already in use in some work reports" @@ -4267,7 +4275,7 @@ msgstr "Seleccionar origen" msgid "Worker deleted" msgstr "Trabajador borrado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:752 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:735 msgid "Select entity, please" msgstr "Seleccionar entidad, por favor" @@ -4307,8 +4315,8 @@ msgstr "Por favor, seleccione un elemento" msgid "Cannot be higher than finish hour" msgstr "No puede ser mayor que la fecha de fin" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:217 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:236 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:201 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:220 msgid "Prefix" msgstr "Prefijo" @@ -4429,10 +4437,14 @@ msgstr "Datos del perfil" #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33 #: libreplan-webapp/src/main/webapp/common/configuration.zul:35 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:263 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:247 msgid "Configuration" msgstr "Configuración" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:402 +msgid "Starting date cannot be empty in forward mode" +msgstr "La fecha de inicio no puede estar vacía en el modo de planificación hacia adelante" + #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:489 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:521 msgid "This date can not be empty" @@ -4454,12 +4466,12 @@ 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:1021 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:685 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:988 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:686 msgid "Hours invested" msgstr "Horas invertidas" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:339 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:323 msgid "Authorization" msgstr "Autorización" @@ -4525,7 +4537,7 @@ msgstr "Vista de la compañía" msgid "Both" msgstr "Ambos" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:882 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:898 msgid "Not editable for containing more that an hours group." msgstr "No editable por contener más de un grupo de horas." @@ -4616,8 +4628,8 @@ msgstr "Borrar calendario" #: 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:673 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1332 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:676 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1368 msgid "must be lower than finish date" msgstr "debe ser menor que la fecha de fin" @@ -4671,7 +4683,7 @@ msgstr "Etiqueta por defecto" msgid "Close" msgstr "Cerrar" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:945 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:944 msgid "Specific Allocations" msgstr "Asignaciones específicas" @@ -4741,6 +4753,11 @@ 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/ws/common/impl/OrderElementConverter.java:558 +#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:614 +msgid "Task {0}: Task group is incompatible type with {1}" +msgstr "Tarea {0}: El grupo de tareas tiene un tipo incompatible con {1}" + #: 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" @@ -4848,7 +4865,7 @@ msgstr "Actualización incompatible: el recurso almacenado no es de tipo: {0}" #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:134 #: 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/templates/templates.zul:146 #: 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 @@ -4908,7 +4925,7 @@ msgstr "Tipo de autenticación" msgid "START" msgstr "INICIO" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:347 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:349 msgid "Schedule from the deadline to start" msgstr "Planificar desde la fecha límite al principio" @@ -4920,6 +4937,10 @@ msgstr "asignación genérica de máquinas" msgid "Non limiting resource assignation" msgstr "Asignación de recursos no limitantes" +#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:627 +msgid "Task {0}: Duplicate code in DB" +msgstr "Tarea {0}: Código duplicado en BD" + #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68 #: libreplan-webapp/src/main/webapp/planner/order.zul:70 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75 @@ -4944,8 +4965,8 @@ msgstr "Administración" #: 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:655 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1315 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:658 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1351 msgid "must be greater than start date" msgstr "debe ser mayor que la fecha de inicio" @@ -5035,7 +5056,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:1072 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1108 msgid "Create project" msgstr "Crear proyecto" @@ -5085,7 +5106,7 @@ msgstr "Calendario raíz" msgid "yes" msgstr "sí" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:871 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:907 msgid "" "Deleting this subcontracted project, you are going to lose the relation to " "report progress. Are you sure?" @@ -5095,7 +5116,7 @@ msgstr "Borrando este proyecto subcontratado, perderá la relación para notific msgid "Select gap" msgstr "Seleccionar intervalo" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:278 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:262 msgid "Port" msgstr "Puerto" @@ -5130,7 +5151,7 @@ msgstr "falta código en un coste por hora" msgid "Exception Day Type" msgstr "Tipo de día de excepción" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:973 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:940 msgid "All workers" msgstr "Todos los trabajadores" @@ -5144,10 +5165,6 @@ msgstr "Seleccione criterios o recursos" msgid "Select required criteria set and press filter button" msgstr "Seleccione conjunto de criterios requeridos y pulse el botón de filtrar" -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:632 -msgid "Hours Group {0} : Duplicate code in DB" -msgstr "Grupo de horas {0} : Código duplicado en BD" - #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:121 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:123 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125 @@ -5155,16 +5172,16 @@ msgstr "Grupo de horas {0} : Código duplicado en BD" #: 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/templates/TemplatesTreeController.java:131 #: 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: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/java/org/libreplan/web/orders/OrderCRUDController.java:1528 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1552 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:740 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:45 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:53 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:89 @@ -5184,6 +5201,7 @@ msgstr "Grupo de horas {0} : Código duplicado en BD" #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:61 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:43 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:49 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:89 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:58 @@ -5302,9 +5320,9 @@ 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: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/planner/TaskElementAdapter.java:985 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:685 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:605 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:328 #: libreplan-webapp/src/main/webapp/templates/templates.zul:64 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 @@ -5382,6 +5400,10 @@ msgstr "Mostrar solo los criterios satisfechos actualmente" msgid "Latest date" msgstr "Fecha más tardía" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:421 +msgid "Deadline cannot be empty in backwards mode" +msgstr "La fecha de fin no puede estar vacía en el modo de planificación hacia atrás" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:625 msgid "Sum of all rows" msgstr "Suma de todas las filas" @@ -5438,7 +5460,7 @@ msgstr "Criterios del tipo seleccionado " #: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:44 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:234 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:218 msgid "Active" msgstr "Activo" @@ -5455,7 +5477,7 @@ msgstr "Etiquetas heredadas" 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/tree/TreeController.java:1079 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 msgid "Unindent" msgstr "Desindentar" @@ -5515,7 +5537,7 @@ msgstr "Lista de proyectos" msgid "Generate code" msgstr "Generar código" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:505 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:488 msgid "The code sequence is already in use and it can not be updated." msgstr "El código de secuencia ya está en uso y no se puede actualizar." @@ -5547,20 +5569,11 @@ msgstr "El número de iteraciones debería estar entre 1 y " 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" - #: libreplan-webapp/src/main/webapp/common/error.zul:54 #: libreplan-webapp/src/main/webapp/common/event_error.zul:50 msgid "Reload" msgstr "Recargar" -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:558 -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:614 -msgid "Task {0} : Task group is incompatible type with {1}" -msgstr "Tarea {0} : El grupo de tareas tiene un tipo incompatible con {1}" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 msgid "Virtual Workers Groups" msgstr "Grupos de trabajadores virtuales" @@ -5593,7 +5606,7 @@ msgstr "Administrador" msgid "Doing {0} reassignations" msgstr "Realizando {0} reasignaciones" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:208 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:192 msgid "Select entity" msgstr "Seleccione entidad" @@ -5640,7 +5653,7 @@ msgstr "Todos los proyectos" #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:41 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:64 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:83 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:299 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:283 msgid "Password" msgstr "Contraseña" @@ -5649,7 +5662,7 @@ msgstr "Contraseña" msgid "Observations" msgstr "Observaciones" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:951 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:987 msgid "Edit project" msgstr "Editar proyecto" @@ -5717,14 +5730,14 @@ msgid "Accept" msgstr "Aceptar" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:81 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:274 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:281 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:288 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:295 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:323 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:358 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:365 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:372 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:258 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:265 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:272 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:279 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:307 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:342 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:349 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:356 msgid "Example: {0}" msgstr "Ejemplo: {0}" @@ -5900,7 +5913,7 @@ 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/templates/templates.zul:108 #: 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 @@ -5988,12 +6001,12 @@ msgstr "Carga" msgid "New criterion" msgstr "Criterio nuevo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:689 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:690 #: 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:102 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:103 #: 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 @@ -6022,7 +6035,7 @@ msgstr "ya existe una asignación para los criterios {0}" msgid "Project Templates" msgstr "Plantillas de proyectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:346 msgid "Forward" msgstr "Adelante" @@ -6130,8 +6143,8 @@ msgstr "Nueva versión de proyecto" #: 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:486 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1235 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:488 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1271 #: 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 @@ -6210,15 +6223,15 @@ msgstr "Árbol {0} aplanado satisfactoriamente" msgid "Unit price" msgstr "Precio de la unidad" -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46 -msgid "Communication date" -msgstr "Fecha de comunicación" - #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:72 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 msgid "Project Code" msgstr "Código del proyecto" +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46 +msgid "Communication date" +msgstr "Fecha de comunicación" + #: libreplan-webapp/src/main/webapp/planner/reassign.zul:30 msgid "Reassigning" msgstr "Reasignando" @@ -6333,7 +6346,7 @@ msgstr "Criterio" msgid "unl" msgstr "ili" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:305 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:289 msgid "Test LDAP connection" msgstr "Probar la conexión con el LDAP" @@ -6351,11 +6364,11 @@ msgstr "falta el código en una etiqueta" msgid "Actual Cost Work Performed" msgstr "Coste de trabajo realizado" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:174 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:176 msgid "Create project from Template" msgstr "Crear proyecto a partir de plantilla" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:420 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:422 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" @@ -6584,7 +6597,7 @@ msgstr "Todas las tareas del proyecto" msgid "The start date cannot be null" msgstr "La fecha de inicio no puede ser nula" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:386 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:370 msgid "LDAP Roles (separated by ;)" msgstr "Roles del LDAP (separados por ;)" @@ -6660,7 +6673,7 @@ 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:376 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:872 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:908 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313 msgid "Confirm" msgstr "Confirmar" @@ -6712,8 +6725,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:1101 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1107 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1117 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1123 #: 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 @@ -6732,7 +6745,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:1251 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1287 #: 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 @@ -6841,7 +6854,7 @@ msgstr "por porcentaje" msgid "by items" msgstr "por items" -#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:34 +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:36 msgid "Use browser language configuration" msgstr "Utilizar la configuración de idioma del navegador" @@ -6898,13 +6911,13 @@ msgstr "No hay días disponibles en los días marcados como disponibles por el c msgid "Maybe the criteria are not satisfied in those days." msgstr "Puede que los criterios no se satisfagan en esos días." -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:170 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:175 msgid "" "The resource's calendar has no available days starting from the start of the" " task." msgstr "El calendario del recurso no tiene días disponibles empezando desde el principio de la tarea." -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:175 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:180 msgid "" "There are no days available at resource's calendar in the days marked " "available by the task's calendar." diff --git a/libreplan-webapp/src/main/resources/i18n/gl.po b/libreplan-webapp/src/main/resources/i18n/gl.po index 26ecdc1e4..fa0a0e27a 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: libreplan-1.2.3\n" +"Project-Id-Version: libreplan-1.2.4\n" "Report-Msgid-Bugs-To: http://bugs.libreplan.org/\n" -"POT-Creation-Date: 2012-04-11 08:32+0200\n" -"PO-Revision-Date: 2012-04-11 08:34+0000\n" +"POT-Creation-Date: 2012-05-04 13:15+0200\n" +"PO-Revision-Date: 2012-05-04 11:22+0000\n" "Last-Translator: Manuel Rego Casasnovas \n" "Language-Team: Galego\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgstr "" msgid "The resource cannot be null" msgstr "O recurso non pode ser nulo" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:354 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:338 msgid "Group path" msgstr "Path do grupo" @@ -125,7 +125,7 @@ msgstr "Crear traballador virtual" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:57 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:226 msgid "Operations" msgstr "Operacións" @@ -169,7 +169,7 @@ msgid "Description cannot be null or empty" msgstr "A descrición non pode ser nula ou baleira" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:72 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:269 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:270 msgid "MonteCarlo Method" msgstr "Método de Montecarlo" @@ -218,7 +218,7 @@ msgstr "Crear tarefa" msgid "LibrePlan: Advanced allocation" msgstr "LibrePlan: Asignación avanzada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:177 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:172 msgid "The {0} sequence prefixes can not be repeated" msgstr "Os prefixos da secuencia de {0} non poden repetirse" @@ -305,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:899 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:935 msgid "The project has no scheduled elements" msgstr "O proxecto no ten elementos planificados" @@ -383,7 +383,7 @@ msgstr "Fai clic neste" msgid "Project Name" msgstr "Nome do proxecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1084 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1100 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306 msgid "Indent" msgstr "Indentar" @@ -392,7 +392,7 @@ msgstr "Indentar" msgid "Reassignation" msgstr "Reasignación" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:327 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:311 msgid "Save passwords in database" msgstr "Gardar contrasinais na base de datos" @@ -430,7 +430,7 @@ msgstr "Novo elemento de formulario de calidade" msgid "LibrePlan: Labels" msgstr "LibrePlan: Etiquetas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:261 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:252 msgid "LDAP connection was successful" msgstr "A conexión co LDAP foi realizada con éxito" @@ -511,6 +511,10 @@ msgstr "un recurso deshabilitado ten subrecursos habilitados" msgid "Client" msgstr "Cliente" +#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:632 +msgid "Hours Group {0}: Duplicate code in DB" +msgstr "Grupo de horas {0}: Clave duplicada en BD" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:153 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:662 msgid "" @@ -518,7 +522,7 @@ msgid "" " can't be added" msgstr "non hai recursos cos criterios solicitados: {0}. Por tanto, non se pode engadir a asignación xenérica" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:347 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:331 msgid "Role search strategy" msgstr "Estratexia para a búsqueda de roles" @@ -576,7 +580,7 @@ msgid "" "criterionSatisfaction from the same criterionType" msgstr "{0} non é válido, criterionType solápase con outro criterionSatisfaction do mesmo criterionType" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:349 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:333 msgid "Group strategy" msgstr "Estratexia de grupo" @@ -612,7 +616,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:836 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:872 msgid "Confirm deleting {0}. Are you sure?" msgstr "Confirmar o borrado de {0}. ¿Está seguro?" @@ -646,7 +650,7 @@ msgstr "Limitante" msgid "Required materials" msgstr "Materiales requiridos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:346 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:348 msgid "Backwards" msgstr "Atrás" @@ -739,7 +743,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:596 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:598 #: 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 @@ -816,7 +820,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:1193 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1217 msgid "Modified" msgstr "Modificado" @@ -828,7 +832,7 @@ msgstr "Engadir criterio" msgid "You can not remove the current scenario" msgstr "Non se pode borrar o escenario actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:672 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:655 msgid "format prefix invalid. It cannot be empty or contain whitespaces." msgstr "formato de prefixo inválido. Non pode estar baleiro ou conter espazos en branco." @@ -865,7 +869,7 @@ msgstr "Lista de modelos" msgid "Subcontracted Tasks List" msgstr "Lista de tarefas subcontratadas" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:240 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:224 msgid "Last value" msgstr "Último valor" @@ -899,7 +903,7 @@ msgstr "Perfil" msgid "Materials Needs At Date" msgstr "Necesidades de materiais en data" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:292 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:276 msgid "UserDn" msgstr "UserDn" @@ -966,12 +970,12 @@ msgstr "¿Está seguro de cambiar o tipo de recurso? Os criterios con diferente msgid "This Criterion has already been added." msgstr "Este criterio xa fora engadido." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:222 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:206 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/java/org/libreplan/web/tree/TreeController.java:876 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:112 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:69 msgid "Budget value cannot be negative" msgstr "O valor do orzamento non pode ser negativo" @@ -1089,7 +1093,7 @@ msgstr "Datos do tipo" msgid "Profiles" msgstr "Perfís" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:271 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:255 msgid "Host" msgstr "Host" @@ -1199,8 +1203,8 @@ msgstr "URL do logo da empresa" msgid "No worker selected" msgstr "Ningún traballador seleccionado" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:220 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:238 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:204 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:222 msgid "Number of digits" msgstr "Número de díxitos" @@ -1230,10 +1234,10 @@ 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: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/planner/TaskElementAdapter.java:1006 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:241 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:697 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:585 #: 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:65 @@ -1362,7 +1366,7 @@ msgstr "a" msgid "worker's first name not specified" msgstr "nome do traballador non especificado" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:350 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:334 msgid "Property strategy" msgstr "Stratexia de propiedade" @@ -1415,7 +1419,7 @@ msgstr "Tipo de progreso" msgid "Task contains consolidated progress. Cannot apply sigmoid function." msgstr "A tarefa contén progreso consolidado. Non se pode aplicar a función sigmoide." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:320 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:304 msgid "UserId" msgstr "UserId" @@ -1442,10 +1446,6 @@ msgstr "Crear proxecto novo" msgid "Stretches list" msgstr "Lista de tramos" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:193 -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}" @@ -1472,7 +1472,7 @@ msgstr "Zoom" #: libreplan-webapp/src/main/webapp/settings/settings.zul:124 #: 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/templates/templates.zul:144 #: 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 @@ -1482,7 +1482,7 @@ msgstr "Zoom" #: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:90 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:48 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:395 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:379 msgid "Save" msgstr "Gardar" @@ -1495,9 +1495,9 @@ msgstr "Esforzo estándar" msgid "Material categories" msgstr "Categorías de materiais" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:595 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:693 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:283 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:578 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:676 msgid "number of digits must be between {0} and {1}" msgstr "o número de díxitos debe estar entre {0} e {1}" @@ -1527,12 +1527,12 @@ msgstr "Autorización de usuarios" msgid "Problems connecting with subcontractor web service" msgstr "Problemas conectando co servizo web subcontratista" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:232 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:216 msgid "Entity type" msgstr "Tipo de entidade" #: 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 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:270 msgid "Unsaved changes will be lost. Are you sure?" msgstr "Perderánse os cambios sen gardar. Está seguro?" @@ -1586,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:1017 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:984 msgid "Name: {0}" msgstr "Nome: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1020 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1036 msgid "Move down" msgstr "Mover abaixo" @@ -1637,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:1282 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1318 msgid "Create Template" msgstr "Crear modelo" @@ -1810,7 +1810,7 @@ msgstr "Engadir a partir de modelo" msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "Os recursos asignados para esta tarefa serán borrados. Está seguro?" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:670 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:653 msgid "" "format prefix invalid. It cannot be empty or contain '_' or whitespaces." msgstr "formato de prefixo inválido. Non pode estar baliero ou conter '_' ou espazos en branco." @@ -1837,11 +1837,11 @@ msgstr "O código non é válido. Hai outro tipo de unidade co mesmo código" msgid "July" msgstr "Xullo" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:255 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:239 msgid "Enable LDAP authentication" msgstr "Habilitar a autenticación LDAP" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:490 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:488 msgid "( max: {0} )" msgstr "( máx: {0} )" @@ -1862,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:1499 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1535 msgid "project name already being used" msgstr "o nome de proxecto xa está sendo usado" @@ -1879,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:519 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:517 msgid "There are not any assigned progress to current task" msgstr "Non hai ningún progreso asignado á tarefa actual" @@ -1908,7 +1908,7 @@ msgstr "Abaixo" msgid "Label" msgstr "Etiqueta" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:987 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1003 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" @@ -1938,7 +1938,7 @@ msgstr "Grupo de horas" msgid "LibrePlan: Accounts" msgstr "LibrePlan: Contas" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:97 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:98 #: 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" @@ -2002,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:92 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:93 #: libreplan-webapp/src/main/webapp/templates/_list.zul:28 msgid "Delay from beginning (days)" msgstr "Retraso desde o comezo (en días)" @@ -2015,7 +2015,7 @@ msgstr "O recurso non pode ser nulo" msgid "Total Hours" msgstr "Horas totais" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:385 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:369 msgid "LibrePlan Role" msgstr "Rol LibrePlan" @@ -2032,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:1523 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1559 msgid "project code already being used" msgstr "o código do proxecto xa está sendo usado" @@ -2040,7 +2040,7 @@ msgstr "o código do proxecto xa está sendo usado" msgid "WBS (tasks)" msgstr "EDT (tarefas)" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:720 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:703 msgid "Deleting sequence" msgstr "Borrando secuencia" @@ -2051,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:844 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:879 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:880 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:915 msgid "Error on showing removing element: " msgstr "Erro ao mostrar o elemento a borrar: " @@ -2164,7 +2164,7 @@ msgstr "O código da tarefa non pode ser nulo" msgid "Derived of calendar {0}" msgstr "Derivado do calendario {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:517 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:515 msgid "It is not allowed to consolidate progress." msgstr "Non se pode borrar progreso consolidado." @@ -2252,7 +2252,7 @@ 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 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:996 msgid "Budget: {0}€, Consumed: {1}€ ({2}%)" msgstr "Orzamento: {0}€, Consumido: {1}€ ({2}%)" @@ -2260,7 +2260,7 @@ msgstr "Orzamento: {0}€, Consumido: {1}€ ({2}%)" msgid "Unallocated name" msgstr "Nome no asignado" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1041 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1057 msgid "Move up" msgstr "Mover arriba" @@ -2310,7 +2310,7 @@ msgstr "Páxina arriba" msgid "Create new project" msgstr "Crear novo proxecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1026 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:993 #: 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 @@ -2328,7 +2328,7 @@ msgstr "Debe empezar despois" msgid "Confirm change" msgstr "Confirmar cambio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:849 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:885 msgid "You don't have permissions to edit this project" msgstr "Non ten permisos para editar este proxecto" @@ -2454,7 +2454,7 @@ msgstr "nome do criterio non especificado" msgid "Value is not valid, the default max value must not be empty " msgstr "O valor non é válido, o valor máximo por defecto non debe estar baleiro " -#: libreplan-webapp/src/main/webapp/common/configuration.zul:362 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:346 msgid "Role property" msgstr "Propiedade do rol" @@ -2475,7 +2475,7 @@ msgstr "Autorizar" msgid "Recommended allocation" msgstr "Asignación recomendada" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:254 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:238 msgid "Activation" msgstr "Activación" @@ -2492,7 +2492,7 @@ msgstr "Materiais gardados" msgid "Total Worked Hours By Resource In A Month" msgstr "Total horas traballadas por recurso nun mes" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:672 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:671 msgid "Other projects" msgstr "Outros proxectos" @@ -2500,7 +2500,7 @@ msgstr "Outros proxectos" msgid "Tasks input buffer" msgstr "Buffer de tarefas de entrada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:173 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:168 msgid "At least one {0} sequence must be active" msgstr "Polo menos unha secuencia de {0} debe estar activa" @@ -2523,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:168 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:163 msgid "At least one {0} sequence is needed" msgstr "Necesítase polo menos unha secuencia de {0}" @@ -2540,7 +2540,7 @@ msgstr "LibrePlan: Categorías de custo" msgid "Assigned" msgstr "Asignado" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:257 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:241 msgid "Use LDAP roles" msgstr "Utilizar roles do LDAP" @@ -2602,7 +2602,7 @@ msgid "Projects" msgstr "Proxectos" #: 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 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:271 msgid "Confirm exit dialog" msgstr "Diálogo para confirmar a salida" @@ -2721,7 +2721,7 @@ msgstr "O esforzo non pode ser nulo" #: libreplan-webapp/src/main/webapp/planner/order.zul:166 #: 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/templates/templates.zul:148 #: 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 @@ -2732,7 +2732,7 @@ msgstr "O esforzo non pode ser nulo" #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:129 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:100 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:398 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:382 msgid "Cancel" msgstr "Cancelar" @@ -2757,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:696 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:908 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:732 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:944 msgid "You don't have read access to this project" msgstr "Non ten acceso de lectura a este proxecto" @@ -2834,11 +2834,11 @@ msgstr "{0} (máx: {1})" msgid "Cost Category" msgstr "Categoría de custo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:473 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:475 msgid "end" msgstr "fin" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:369 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:353 msgid "Role search query" msgstr "Consulta para a búsqueda de roles" @@ -2888,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:864 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:900 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 " @@ -2968,7 +2968,7 @@ msgstr "Nome da tarefa" msgid "cost assignment's resource not specified" msgstr "recurso da asignación de custo non especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:129 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:131 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45 @@ -2977,6 +2977,12 @@ msgstr "recurso da asignación de custo non especificado" msgid "Project" msgstr "Proxecto" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:407 +msgid "" +"Starting date cannot be empty because there is a task with constraint \"as " +"soon as possible\"" +msgstr "A data de inicio non pode estar baleira porque hai unha tarefa coa restrición \"tan pronto como sexa posible\"" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/TwoWaySelector.java:79 msgid "Unassigned" msgstr "Non asignado" @@ -3037,8 +3043,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:1243 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1258 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1210 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1225 msgid "{0} not supported yet" msgstr "{0} aínda non soportado" @@ -3060,11 +3066,11 @@ msgstr "Entrada nova" msgid "Resources Load" msgstr "Carga de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:225 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:220 msgid "Some sequences to remove not existed" msgstr "Algunhas secuencias para borrar non existen" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:233 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:224 msgid "Changes have been canceled" msgstr "Cambios cancelados" @@ -3072,7 +3078,7 @@ msgstr "Cambios cancelados" msgid "LibrePlan: Hours Worked Per Worker In A Month" msgstr "LibrePlan: Horas traballadas por traballador nun mes" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:312 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:296 msgid "Authentication" msgstr "Autenticación" @@ -3139,7 +3145,7 @@ msgstr "Seleccionar data de inicio" 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:886 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:922 msgid "Removed {0}" msgstr "{0} borrado" @@ -3194,7 +3200,7 @@ msgstr "Engadir fito" msgid "Assign selected items" msgstr "Asignar elementos seleccionados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:452 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:454 msgid "init" msgstr "inicio" @@ -3236,7 +3242,7 @@ msgstr "Consolidado" msgid "Work report types" msgstr "Tipos de partes de traballo" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:187 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:180 msgid "MonteCarlo method" msgstr "Método de Montecarlo" @@ -3280,7 +3286,7 @@ msgstr "Monstrar barra de coste monetario" msgid "criterion type name not specified" msgstr "nome do tipo de criterio non especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:265 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:256 msgid "Cannot connect to LDAP server" msgstr "Non se pode conectar ao servidor de LDAP" @@ -3317,10 +3323,6 @@ msgstr "Campos de cabeceira" msgid "Progress type" msgstr "Tipo de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:581 -msgid "Task {0} : Project is incompatible type with {1}" -msgstr "Tarefa {0} : O proxecto ten un tipo incompatible con {1}" - #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:155 msgid "" "Time period contains non valid data. Ending data must be older than starting" @@ -3339,6 +3341,10 @@ msgstr "O contrasinal da conta de admin segue sendo o contrasinal por defecto. E msgid "Save Project" msgstr "Gardar proxecto" +#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:581 +msgid "Task {0}: Project is incompatible type with {1}" +msgstr "Tarefa {0}: O proxecto ten un tipo incompatible con {1}" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:318 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:324 msgid "Day is not valid" @@ -3577,11 +3583,11 @@ msgstr "Asignación: [{0},{1}]" msgid "Virtual Workers Group" msgstr "Grupo de traballadores virtuais" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:217 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:208 msgid "Changes saved" msgstr "Cambios gardados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1267 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1303 msgid "See scheduling" msgstr "Ver planificación" @@ -3669,7 +3675,7 @@ msgstr "Tipos de progreso" msgid "Cost category" msgstr "Categoría de custo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:719 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:702 msgid "It can not be deleted. At least one sequence is necessary." msgstr "Non se pode borrar. Polo menos unha secuencia é necesaria." @@ -3711,6 +3717,12 @@ msgstr "Código de referencia do cliente" msgid "Constraint" msgstr "Restrición" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:426 +msgid "" +"Deadline cannot be empty because there is a task with constraint \"as late " +"as possible\"" +msgstr "A data de fin non pode estar baleira porque hai unha tarefa coa restrición \"tan tarde como sexa posible\"" + #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150 msgid "Add New Label Type Field" msgstr "Engadir novo campo de tipo de etiqueta" @@ -3724,21 +3736,21 @@ msgid "Customer reference" msgstr "Referencia del cliente" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:326 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:360 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:365 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 #: 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: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:733 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:886 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:936 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:945 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:972 #: 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:935 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:971 msgid "Sorry, you do not have permissions to access this project" msgstr "Sentímolo, non ten permisos para acceder a este proxecto" @@ -3888,7 +3900,7 @@ msgid "" "{0}" msgstr "Erro gardando un proxecto\n{0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:358 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:363 msgid "" "The task has got progress consolidations. It must delete all consolidations " "to change the resource allocation type " @@ -3968,7 +3980,7 @@ msgstr "Recursos limitantes" msgid "Task Information" msgstr "Información da tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:142 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:144 msgid "Hours Group at " msgstr "Grupo de horas en " @@ -4036,7 +4048,7 @@ msgstr "Invalidar" msgid "Budget hours" msgstr "Horas do presuposto" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:150 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:151 msgid "Edit task: {0}" msgstr "Editar tarefa: {0}" @@ -4121,7 +4133,7 @@ msgstr "Notificar progreso" msgid "Show dependencies" msgstr "Mostrar dependencias" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:346 msgid "Schedule from start to deadline" msgstr "Planificar dende o principio á data límite" @@ -4214,10 +4226,6 @@ msgstr "Nos períodos dispoñibles {0} só hai dispoñibles {1} horas." msgid "Association with profiles" msgstr "Asociación con perfís" -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:627 -msgid "Task {0} : Duplicate code in DB" -msgstr "Tarefa {0} : Código duplicado en BD" - #: libreplan-webapp/src/main/webapp/common/error.zul:30 #: libreplan-webapp/src/main/webapp/common/event_error.zul:25 msgid "Message - {0}" @@ -4244,7 +4252,7 @@ msgstr "Preferencias da aplicación" msgid "Average of estimated hours" msgstr "Media de horas estimadas" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:285 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:269 msgid "Base" msgstr "Base" @@ -4252,7 +4260,7 @@ msgstr "Base" msgid "Total dedication" msgstr "Dedicación total" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:686 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:689 msgid "" "You can not remove the task \"{0}\" because of this or any of its children " "are already in use in some work reports" @@ -4266,7 +4274,7 @@ msgstr "Seleccionar orixe" msgid "Worker deleted" msgstr "Traballador borrado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:752 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:735 msgid "Select entity, please" msgstr "Seleccionar entidade, por favor" @@ -4306,8 +4314,8 @@ msgstr "Por favor, seleccione un elemento" msgid "Cannot be higher than finish hour" msgstr "Non pode ser posterior á data de fin" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:217 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:236 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:201 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:220 msgid "Prefix" msgstr "Prefixo" @@ -4428,10 +4436,14 @@ msgstr "Datos do perfil" #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33 #: libreplan-webapp/src/main/webapp/common/configuration.zul:35 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:263 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:247 msgid "Configuration" msgstr "Configuración" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:402 +msgid "Starting date cannot be empty in forward mode" +msgstr "A data de inicio non pode estar baleira no modo de planificación cara adiante" + #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:489 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:521 msgid "This date can not be empty" @@ -4453,12 +4465,12 @@ 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:1021 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:685 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:988 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:686 msgid "Hours invested" msgstr "Horas invertidas" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:339 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:323 msgid "Authorization" msgstr "Autorización" @@ -4524,7 +4536,7 @@ msgstr "Vista da compañía" msgid "Both" msgstr "Ambos" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:882 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:898 msgid "Not editable for containing more that an hours group." msgstr "Non editable por conter máis dun grupo de horas." @@ -4615,8 +4627,8 @@ msgstr "Borrar calendario" #: 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:673 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1332 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:676 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1368 msgid "must be lower than finish date" msgstr "debe ser anterior á data de fin" @@ -4670,7 +4682,7 @@ msgstr "Etiqueta por defecto" msgid "Close" msgstr "Pechar" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:945 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:944 msgid "Specific Allocations" msgstr "Asignacións específicas" @@ -4740,6 +4752,11 @@ 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/ws/common/impl/OrderElementConverter.java:558 +#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:614 +msgid "Task {0}: Task group is incompatible type with {1}" +msgstr "Tarefa {0}: O grupo de tarefas ten un tipo incompatible con {1}" + #: 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" @@ -4847,7 +4864,7 @@ msgstr "Actualización incompatible: i recurso almacenado non é de tipo: {0}" #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:134 #: 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/templates/templates.zul:146 #: 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 @@ -4907,7 +4924,7 @@ msgstr "Tipo de autenticación" msgid "START" msgstr "INICIO" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:347 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:349 msgid "Schedule from the deadline to start" msgstr "Planificar dende a data límite ao principio" @@ -4919,6 +4936,10 @@ msgstr "asignación xenérica de máquinas" msgid "Non limiting resource assignation" msgstr "Asignación de recursos non limitantes" +#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:627 +msgid "Task {0}: Duplicate code in DB" +msgstr "Tarefa {0}: Código duplicado en BD" + #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68 #: libreplan-webapp/src/main/webapp/planner/order.zul:70 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75 @@ -4943,8 +4964,8 @@ msgstr "Administración" #: 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:655 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1315 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:658 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1351 msgid "must be greater than start date" msgstr "debe ser maior que a data de inicio" @@ -5034,7 +5055,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:1072 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1108 msgid "Create project" msgstr "Crear proxecto" @@ -5084,7 +5105,7 @@ msgstr "Calendario raíz" msgid "yes" msgstr "si" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:871 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:907 msgid "" "Deleting this subcontracted project, you are going to lose the relation to " "report progress. Are you sure?" @@ -5094,7 +5115,7 @@ msgstr "Borrando este proxecto subcontrado, perderá a relación para notificar msgid "Select gap" msgstr "Seleccionar intervalo" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:278 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:262 msgid "Port" msgstr "Porto" @@ -5129,7 +5150,7 @@ msgstr "falta código nun custo por hora" msgid "Exception Day Type" msgstr "Tipo de día de excepción" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:973 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:940 msgid "All workers" msgstr "Todos os traballadores" @@ -5143,10 +5164,6 @@ msgstr "Seleccione criterios ou recursos" msgid "Select required criteria set and press filter button" msgstr "Seleccione conxunto de criterios requeridos e pulse o botón de filtrar" -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:632 -msgid "Hours Group {0} : Duplicate code in DB" -msgstr "Grupo de horas {0} : Clave duplicada en BD" - #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:121 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:123 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125 @@ -5154,16 +5171,16 @@ msgstr "Grupo de horas {0} : Clave duplicada en BD" #: 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/templates/TemplatesTreeController.java:131 #: 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: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/java/org/libreplan/web/orders/OrderCRUDController.java:1528 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1552 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:740 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:45 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:53 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:89 @@ -5183,6 +5200,7 @@ msgstr "Grupo de horas {0} : Clave duplicada en BD" #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:61 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:43 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:49 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:89 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:58 @@ -5301,9 +5319,9 @@ 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: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/planner/TaskElementAdapter.java:985 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:685 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:605 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:328 #: libreplan-webapp/src/main/webapp/templates/templates.zul:64 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 @@ -5381,6 +5399,10 @@ msgstr "Mostrar só os criterios satisfeitos actualmente" msgid "Latest date" msgstr "Data máis tardía" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:421 +msgid "Deadline cannot be empty in backwards mode" +msgstr "A data de fin non pode estar baleira no modo de planificación cara atrás" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:625 msgid "Sum of all rows" msgstr "Suma de todas as filas" @@ -5437,7 +5459,7 @@ msgstr "Criterios do tipo seleccionado " #: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:44 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:234 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:218 msgid "Active" msgstr "Activo" @@ -5454,7 +5476,7 @@ msgstr "Etiquetas herdadas" 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/tree/TreeController.java:1079 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 msgid "Unindent" msgstr "Desindentar" @@ -5514,7 +5536,7 @@ msgstr "Listado de proxectos" msgid "Generate code" msgstr "Xerar código" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:505 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:488 msgid "The code sequence is already in use and it can not be updated." msgstr "O código da secuencia xa está en uso e non se pode actualizar." @@ -5546,20 +5568,11 @@ msgstr "O número de iteracións debe estar entre 1 e " 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" - #: libreplan-webapp/src/main/webapp/common/error.zul:54 #: libreplan-webapp/src/main/webapp/common/event_error.zul:50 msgid "Reload" msgstr "Recargar" -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:558 -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:614 -msgid "Task {0} : Task group is incompatible type with {1}" -msgstr "Tarefa {0} : O grupo de tarefas ten un tipo incompatible con {1}" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 msgid "Virtual Workers Groups" msgstr "Grupos de traballadores virtuais" @@ -5592,7 +5605,7 @@ msgstr "Administrador" msgid "Doing {0} reassignations" msgstr "Realizando {0} reasignacións" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:208 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:192 msgid "Select entity" msgstr "Seleccione entidade" @@ -5639,7 +5652,7 @@ msgstr "Todos os proxectos" #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:41 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:64 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:83 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:299 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:283 msgid "Password" msgstr "Contrasinal" @@ -5648,7 +5661,7 @@ msgstr "Contrasinal" msgid "Observations" msgstr "Observacións" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:951 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:987 msgid "Edit project" msgstr "Editar proxecto" @@ -5716,14 +5729,14 @@ msgid "Accept" msgstr "Aceptar" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:81 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:274 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:281 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:288 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:295 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:323 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:358 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:365 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:372 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:258 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:265 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:272 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:279 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:307 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:342 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:349 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:356 msgid "Example: {0}" msgstr "Exemplo: {0}" @@ -5899,7 +5912,7 @@ 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/templates/templates.zul:108 #: 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 @@ -5987,12 +6000,12 @@ msgstr "Carga" msgid "New criterion" msgstr "Criterio novo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:689 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:690 #: 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:102 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:103 #: 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 @@ -6021,7 +6034,7 @@ msgstr "xa existe unha asignación para os criterios {0}" msgid "Project Templates" msgstr "Modelos de proxectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:346 msgid "Forward" msgstr "Adiante" @@ -6129,8 +6142,8 @@ msgstr "Nova versión de proxecto" #: 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:486 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1235 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:488 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1271 #: 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 @@ -6209,15 +6222,15 @@ msgstr "Árobre {0} aplanada satisfatoriamente" msgid "Unit price" msgstr "Prezo da unidade" -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46 -msgid "Communication date" -msgstr "Data de comunicación" - #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:72 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 msgid "Project Code" msgstr "Código do proxecto" +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46 +msgid "Communication date" +msgstr "Data de comunicación" + #: libreplan-webapp/src/main/webapp/planner/reassign.zul:30 msgid "Reassigning" msgstr "Reasignando" @@ -6332,7 +6345,7 @@ msgstr "Criterio" msgid "unl" msgstr "ili" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:305 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:289 msgid "Test LDAP connection" msgstr "Probar a conexión co LDAP" @@ -6350,11 +6363,11 @@ msgstr "falta o código nunha etiqueta" msgid "Actual Cost Work Performed" msgstr "Custo de traballo realizado" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:174 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:176 msgid "Create project from Template" msgstr "Crear proxecto a partir de modelo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:420 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:422 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" @@ -6583,7 +6596,7 @@ msgstr "Todas as tarefas do proxecto" msgid "The start date cannot be null" msgstr "A data de inicio non pode ser nula" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:386 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:370 msgid "LDAP Roles (separated by ;)" msgstr "Roles do LDAP (separados por ;)" @@ -6659,7 +6672,7 @@ 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:376 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:872 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:908 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313 msgid "Confirm" msgstr "Confirmar" @@ -6711,8 +6724,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:1101 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1107 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1117 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1123 #: 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 @@ -6731,7 +6744,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:1251 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1287 #: 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 @@ -6840,7 +6853,7 @@ msgstr "por porcentaxe" msgid "by items" msgstr "por ítems" -#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:34 +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:36 msgid "Use browser language configuration" msgstr "Utilizar a configuración de idioma do navegador" @@ -6897,13 +6910,13 @@ msgstr "Non hai días dispoñibles nos días marcados como dispoñibles polo cal msgid "Maybe the criteria are not satisfied in those days." msgstr "Pode que os criterios non se satisfagan neses días." -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:170 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:175 msgid "" "The resource's calendar has no available days starting from the start of the" " task." msgstr "O calendario do recurso non ten días dispoñibles comezando dende o principio da tarefa." -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:175 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:180 msgid "" "There are no days available at resource's calendar in the days marked " "available by the task's calendar."