diff --git a/libreplan-webapp/src/main/resources/i18n/es.po b/libreplan-webapp/src/main/resources/i18n/es.po index 58f5cf83e..6e7020d26 100644 --- a/libreplan-webapp/src/main/resources/i18n/es.po +++ b/libreplan-webapp/src/main/resources/i18n/es.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-11 09:11+0100\n" -"PO-Revision-Date: 2011-11-11 09:25+0100\n" +"POT-Creation-Date: 2011-11-25 11:40+0100\n" +"PO-Revision-Date: 2011-11-25 11:49+0100\n" "Last-Translator: Manuel Rego Casasnovas \n" "Language-Team: Spanish <>\n" "Language: es\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:336 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:341 msgid "Group path" msgstr "Path del grupo" @@ -86,12 +86,13 @@ msgstr "Crear trabajador virtual" #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:40 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:28 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:81 #: libreplan-webapp/src/main/webapp/materials/materials.zul:61 #: libreplan-webapp/src/main/webapp/materials/materials.zul:86 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:29 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:88 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68 @@ -149,12 +150,12 @@ msgstr "Parte de trabajo borrado con éxito" msgid "It can not be empty" msgstr "No puede estar vacío" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 #: libreplan-webapp/src/main/webapp/materials/materials.zul:33 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:97 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:53 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:145 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:55 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:147 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:54 #: libreplan-webapp/src/main/webapp/templates/templates.zul:66 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22 @@ -201,13 +202,13 @@ msgid "Summary" msgstr "Resumen" #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:445 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 #: libreplan-webapp/src/main/webapp/templates/templates.zul:67 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53 msgid "Quality Forms" msgstr "Formularios de calidad" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337 msgid "Reports" msgstr "Informes" @@ -241,8 +242,8 @@ msgstr "" msgid "Dedication chart" msgstr "Gráfico de dedicación" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:702 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:729 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:689 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:716 msgid "Progress that are reported by quality forms can not be modified" msgstr "" "El progreso notificado por formularios de calidad no pueden ser modificado" @@ -263,7 +264,7 @@ msgstr "No se puede borrar ese material porque está asignado a un projecto." msgid "Remove limiting resource element" msgstr "Borrar elemento de recurso limitante" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:136 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:150 msgid "Resource Usage" @@ -278,7 +279,7 @@ msgid "Unassign" msgstr "Desasignar" #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:157 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:296 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:302 msgid "Companies" msgstr "Empresas" @@ -286,7 +287,7 @@ msgstr "Empresas" msgid "Manual assignment" msgstr "Asignación manual" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:75 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:74 msgid "Quality form items list" msgstr "Lista de elementos del formulario de calidad" @@ -308,7 +309,7 @@ msgstr "Crear {0}: {1}" msgid "generic workers allocation" msgstr "asignación genérica de trabajadores" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:890 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:898 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:308 msgid "The project has no scheduled elements" msgstr "El proyecto no tiene elementos planificados" @@ -352,7 +353,7 @@ msgstr "Capacidad de recursos" msgid "changing perspective" msgstr "cambio de perspectiva" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:31 msgid "Transfer Projects Between Scenarios" msgstr "Transferir proyectos entre escenarios" @@ -375,11 +376,11 @@ msgid "Project Name" msgstr "Nombre del proyecto" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:938 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:966 msgid "Indent" msgstr "Indentar" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:312 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:314 msgid "Save passwords in database" msgstr "Guardar contraseñas en la base de datos" @@ -413,7 +414,7 @@ msgstr "Lista de excepciones" msgid "Locations" msgstr "Ubicaciones" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:78 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:77 msgid "New quality form item" msgstr "Nuevo elemento del formulario de calidad" @@ -421,7 +422,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:242 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:269 msgid "LDAP connection was successful" msgstr "La conexión con el LDAP se ha realizado con éxito" @@ -429,11 +430,6 @@ msgstr "La conexión con el LDAP se ha realizado con éxito" msgid "Login name" msgstr "Nombre de usuario" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:81 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 -msgid "LibrePlan user" -msgstr "Usuario de LibrePlan" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:84 msgid "{0} List" msgstr "{0} Lista" @@ -463,7 +459,7 @@ msgstr "" "aplicables a este recurso" #: libreplan-webapp/src/main/webapp/orders/_edition.zul:50 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:53 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:52 #: libreplan-webapp/src/main/webapp/templates/templates.zul:65 msgid "Criterion Requirement" msgstr "Criterio requerido" @@ -514,6 +510,10 @@ msgstr "" "no hay recursos con los criterios solicitados: {0}. Por tanto, no se puede " "añadir la asignación genérica" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:334 +msgid "Role search strategy" +msgstr "Estrategia para la búsqueda de roles" + #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:478 msgid "Error on showing warning message removing calendar: " msgstr "Error al mostrar mensaje de advertencia borrando calendario: " @@ -530,11 +530,11 @@ msgstr "el nombre de la categoría de materiales debe ser único. Ya está en us #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:44 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:47 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:46 msgid "Imputed hours" msgstr "Horas imputadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:37 msgid "Project Costs Per Resource" msgstr "Costes de proyecto por recurso" @@ -572,11 +572,15 @@ msgstr "" "{0} no es válido, criterionType se solapa con otro criterionSatisfaction del " "mismo criterionType" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:336 +msgid "Group strategy" +msgstr "Estrategia de grupo" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 msgid "Work Report Lines" msgstr "Líneas de parte de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1546 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1555 msgid "Configure" msgstr "Configurar" @@ -587,7 +591,7 @@ msgstr "Octubre" #: libreplan-webapp/src/main/webapp/settings/settings.zul:58 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:36 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:58 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:50 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:51 msgid "First name" msgstr "Nombre" @@ -602,8 +606,8 @@ msgstr "Campos de texto complementario" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:210 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:450 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:827 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:291 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:835 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 msgid "Confirm deleting {0}. Are you sure?" msgstr "Confirmar el borrado de {0}. ¿Está seguro?" @@ -612,11 +616,11 @@ msgstr "Confirmar el borrado de {0}. ¿Está seguro?" msgid "Work Reports List" msgstr "Lista de partes de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:313 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319 msgid "Accounts" msgstr "Cuentas" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:85 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:87 msgid "External code" msgstr "Código externo" @@ -642,7 +646,7 @@ msgstr "Materiales requeridos" msgid "resources per day must be not empty and bigger than zero" msgstr "los recursos por día deben ser no vacíos y mayores que cero" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:341 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:349 msgid "Backwards" msgstr "Atrás" @@ -656,7 +660,7 @@ msgid "Apply filtering to resources satisfying required criteria" msgstr "" "Aplicar filtrado a los recursos que satisfacen los criterios requeridos" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:106 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:105 msgid "Up" msgstr "Arriba" @@ -704,6 +708,10 @@ msgstr "" "El valor no es válido, el valor máximo por defecto debe ser mayor que el " "valor de precisión" +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:245 +msgid "missing worker code in the work report" +msgstr "falta código de trabajador en un parte de trabajo" + #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55 #: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82 @@ -715,16 +723,12 @@ msgstr "" msgid "End date" msgstr "Fecha de fin" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:245 -msgid "missing worker code in the work report" -msgstr "falta código de trabajador en un parte de trabajo" - #: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:89 msgid "profile name is already being used by another profile" msgstr "el nombre del perfil ya está siendo usado por otro perfil" #: libreplan-webapp/src/main/webapp/settings/settings.zul:68 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:76 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:78 msgid "E-mail" msgstr "Correo electrónico" @@ -738,8 +742,8 @@ 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:593 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:594 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:327 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 @@ -788,7 +792,7 @@ msgstr "" msgid "Personal data" msgstr "Datos personales" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:733 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:720 msgid "Calculated progress can not be removed" msgstr "El progreso calculado no se puede borrar" @@ -812,11 +816,11 @@ msgstr "{0} anotación obligatoria en {1}" msgid "June" msgstr "Junio" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1038 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1066 msgid "Modified" msgstr "Modificado" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:216 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:215 msgid "Add Criterion" msgstr "Añadir criterio" @@ -824,7 +828,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:653 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:680 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 " @@ -871,7 +875,7 @@ msgstr "Lista de tareas subcontratadas" msgid "Average of worked hours in finished applications" msgstr "Media de horas trabajadas en las aplicaciones finalizadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:706 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:693 msgid "Calculated progress can not be modified" msgstr "El progreso calculado no se puede modificar" @@ -892,12 +896,12 @@ msgstr "Editar calendario" msgid "Profile" msgstr "Perfil" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:346 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:37 msgid "Materials Needs At Date" msgstr "Necesidades de materiales en fecha" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:277 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:279 msgid "UserDn" msgstr "UserDn" @@ -980,7 +984,7 @@ msgstr "Se perderán los cambios sin guardar. ¿Le gustaría continuar?" msgid "NON_LIMITING" msgstr "NO_LIMITANTE" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:291 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:297 msgid "Workers" msgstr "Trabajadores" @@ -1020,7 +1024,7 @@ msgstr "nombre del perfil no especificado" msgid "Date Start" msgstr "Fecha de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1275 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1261 msgid "Value is not valid, the current value must be less than max value" msgstr "" "El valor no es válido, el valor actual debe ser menor que el valor máximo" @@ -1028,7 +1032,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 -#: libreplan-webapp/src/main/webapp/planner/order.zul:108 +#: libreplan-webapp/src/main/webapp/planner/order.zul:105 msgid "Value" msgstr "Valor" @@ -1041,7 +1045,7 @@ msgid "there are no valid periods for this calendar" msgstr "no hay períodos válidos para este calendario" #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:54 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:93 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:95 msgid "Add role" msgstr "Añadir rol" @@ -1052,8 +1056,8 @@ msgstr "" "La fecha de fin de una excepción debe ser mayor o igual que la fecha de " "inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:443 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:453 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:444 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:454 msgid "Repeated Project code {0} in Project {1}" msgstr "Código {0} de proyecto repetdio en proyecto {1}" @@ -1086,11 +1090,11 @@ msgid "Type data" msgstr "Datos del tipo" #: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:117 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:314 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 msgid "Profiles" msgstr "Perfiles" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:256 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:258 msgid "Host" msgstr "Host" @@ -1152,7 +1156,7 @@ msgstr "Cambiar escenario" msgid "Critical path" msgstr "Camino crítico" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:260 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:262 msgid "" "Deleting this item, it will disable the report progress option. Are you sure?" msgstr "" @@ -1194,11 +1198,11 @@ msgid "Cancel changes and back to scheduling" msgstr "Cancelar cambios y volver a la planificación" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:386 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86 #: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:65 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68 -#: libreplan-webapp/src/main/webapp/planner/order.zul:109 +#: libreplan-webapp/src/main/webapp/planner/order.zul:106 msgid "Percentage" msgstr "Porcentaje" @@ -1241,12 +1245,12 @@ msgstr "Tipo de excepción" msgid "Profiles List" msgstr "Lista de Perfiles" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:580 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:581 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:689 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:236 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:919 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:51 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:329 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:914 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:50 #: libreplan-webapp/src/main/webapp/templates/templates.zul:64 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:68 @@ -1258,12 +1262,12 @@ msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "" "{0} de la categoría {1} y {2} de la categoría {3} tienen el mismo código" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 msgid "Data Types" msgstr "Tipos de datos" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:155 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:157 msgid "Total hours" msgstr "Total de horas" @@ -1328,13 +1332,13 @@ msgstr "ya asignado" #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:74 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:131 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:133 #: libreplan-webapp/src/main/webapp/common/configuration.zul:139 -#: libreplan-webapp/src/main/webapp/planner/order.zul:154 +#: libreplan-webapp/src/main/webapp/planner/order.zul:151 msgid "Calendar" msgstr "Calendario" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:301 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:307 #: libreplan-webapp/src/main/webapp/common/configuration.zul:119 msgid "Resources" msgstr "Recursos" @@ -1368,11 +1372,15 @@ msgstr "a" msgid "worker's first name not specified" msgstr "nombre del trabajador no especificado" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:337 +msgid "Property strategy" +msgstr "Estrategia de propiedad" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:281 msgid "date not specified" msgstr "fecha no especificada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:264 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:196 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:206 msgid "Projects Planning" @@ -1382,13 +1390,13 @@ msgstr "Planificación de proyectos" msgid "Shrink to fit page width" msgstr "Reducir para ajustar al ancho de página" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:773 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:760 msgid "The max value must be greater than 0" msgstr "El valor máximo debe ser mayor que 0" #: libreplan-webapp/src/main/webapp/settings/settings.zul:63 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:70 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:55 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:56 msgid "Last name" msgstr "Apellidos" @@ -1413,13 +1421,13 @@ msgstr "SPI" msgid "Progress Type" msgstr "Tipo de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1295 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1304 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:305 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:307 msgid "UserId" msgstr "UserId" @@ -1444,7 +1452,7 @@ msgstr "el código no puede ser nulo o vacío" msgid "Create New Project" msgstr "Crear proyecto nuevo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1430 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1439 msgid "Stretches list" msgstr "Lista de tramos" @@ -1456,7 +1464,7 @@ msgstr "Habilitar módulo de escenarios" msgid "Zoom" msgstr "Zoom" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:829 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:833 #: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:205 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:185 @@ -1475,16 +1483,16 @@ msgstr "Zoom" #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112 #: libreplan-webapp/src/main/webapp/materials/materials.zul:115 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:39 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:132 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:131 #: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:64 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:76 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:81 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:151 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 #: libreplan-webapp/src/main/webapp/templates/templates.zul:135 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:376 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:384 msgid "Save" msgstr "Guardar" @@ -1497,9 +1505,9 @@ msgstr "Esfuerzo estándar" msgid "Material categories" msgstr "Categorías de materiales" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:273 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:576 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:674 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:300 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:603 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:701 msgid "number of digits must be between {0} and {1}" msgstr "el número de dígitos debe estar entre {0} y {1}" @@ -1527,7 +1535,8 @@ msgstr "Problemas conectando con el servicio web subcontratista" msgid "Entity type" msgstr "Tipo de entidad" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:263 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:271 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1023 msgid "Unsaved changes will be lost. Are you sure?" msgstr "Se perderán los cambios sin guardar. ¿Está seguro?" @@ -1583,11 +1592,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:907 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:902 msgid "Name: {0}" msgstr "Nombre: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:874 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:902 msgid "Move down" msgstr "Mover abajo" @@ -1619,12 +1628,12 @@ msgstr "Datos generales" msgid "BAC" msgstr "BAC" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:379 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:381 msgid "Calculate Number of Hours" msgstr "Calcular número de horas" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:105 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:104 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38 msgid "Assign" @@ -1634,7 +1643,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:1273 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1281 msgid "Create Template" msgstr "Crear plantilla" @@ -1793,7 +1802,7 @@ msgstr "el nombre no puede ser nulo o vacío" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:87 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 -#: libreplan-webapp/src/main/webapp/planner/order.zul:110 +#: libreplan-webapp/src/main/webapp/planner/order.zul:107 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:48 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 @@ -1810,7 +1819,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:651 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:678 msgid "" "format prefix invalid. It cannot be empty or contain '_' or whitespaces." msgstr "" @@ -1827,7 +1836,7 @@ msgstr "Filtrar por mes" msgid "The criterion and its type cannot be null" msgstr "El criterio y su tipo no pueden ser nulos" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:421 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:422 msgid "The quality form must have an item with 100% value to report progress" msgstr "" "El formulario de calidad debe tener un ítem con valor 100% para notificar " @@ -1841,6 +1850,10 @@ msgstr "Julio" msgid "The code is not valid. There is another unit type with the same code" msgstr "El código no es válido. Hay otro tipo de unidad con el mismo código" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 +msgid "Enable LDAP authentication" +msgstr "Habilitar la autenticación LDAP" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:490 msgid "( max: {0} )" msgstr "( máx: {0} )" @@ -1861,6 +1874,7 @@ msgstr "No se pueden calcular gráficos para los datos actuales" msgid "Select queue" msgstr "Seleccionar cola" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1499 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:173 msgid "project name already being used" msgstr "el nombre de proyecto ya está siendo usado" @@ -1869,7 +1883,7 @@ msgstr "el nombre de proyecto ya está siendo usado" msgid "Work description" msgstr "Descripción del trabajo" -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:63 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:61 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:59 msgid "Split assignment" msgstr "Dividir asignación" @@ -1893,7 +1907,7 @@ msgstr "No se puede borrar el escenario por defecto, llamado \"{0}\"" msgid "direct link" msgstr "enlace directo" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:112 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:111 msgid "Down" msgstr "Abajo" @@ -1907,13 +1921,13 @@ msgstr "Abajo" msgid "Label" msgstr "Etiqueta" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:841 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:869 msgid "Value is not valid, taking into account the current list of HoursGroup" msgstr "" "El valor no es válido, teniendo en cuenta la lista actual de grupos de horas" #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:51 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:90 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:92 msgid "Association with roles" msgstr "Asociación con roles" @@ -1925,8 +1939,8 @@ msgstr "falta el tipo de horas en una línea del parte de trabajo" msgid "Quality forms" msgstr "Formularios de calidad" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:466 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:476 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:467 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:477 msgid "Repeated Hours Group code {0} in Project {1}" msgstr "Código {0} de grupo de horas repetido en proyecto {1}" @@ -1975,7 +1989,7 @@ msgstr "Pesimista" msgid "Limiting resource assignation" msgstr "Asignación de recursos limitantes" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1224 msgid "" "This progress can not be removed, because it is spread. It is necessary to " "select another progress as spread." @@ -2013,11 +2027,11 @@ msgstr "Retraso desde el comienzo (en días)" msgid "Resource cannot be null" msgstr "El recurso no puede ser nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:453 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:455 msgid "Total Hours" msgstr "Horas totales" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:366 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:374 msgid "LibrePlan Role" msgstr "Rol LibrePlan" @@ -2029,28 +2043,32 @@ msgstr "Crear tipo de progreso" msgid "Confirm cancel" msgstr "Confirmar cancelación" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:37 msgid "Work And Progress Per Task" msgstr "Trabajo y progreso por tarea" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1523 +msgid "project code already being used" +msgstr "el código del proyecto ya está siendo usado" + #: libreplan-webapp/src/main/webapp/orders/_edition.zul:40 msgid "WBS (tasks)" msgstr "EDT (tareas)" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1234 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:455 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:300 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:299 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:465 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:150 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:835 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:870 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:843 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:878 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:264 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:208 msgid "Error on showing removing element: " msgstr "Error al mostrar el elemento a borrar: " -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:701 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:728 msgid "Deleting sequence" msgstr "Borrando secuencia" @@ -2119,11 +2137,15 @@ msgstr "Histórico de asignación" msgid "CutycaptTimeout thread exception" msgstr "Excepción de thread CutycaptTimeout" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:22 msgid "Work Report Models" msgstr "Modelos de partes de trabajo" +#: libreplan-webapp/src/main/webapp/materials/materials.zul:73 +msgid "New" +msgstr "Nuevo" + #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:48 msgid "Date last progress measurement" msgstr "Fecha de la última medida de progreso" @@ -2148,7 +2170,7 @@ msgstr "" "El calendario no se puede borrar porque aún tiene hijos. Algún otro " "calendario deriva de este." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:907 msgid "Value is not valid, the type must be not empty" msgstr "El valor no es válido, el tipo no debe ser vacío" @@ -2168,21 +2190,16 @@ msgstr "No se permite consolidar progreso." msgid "Create Task" msgstr "Crear tarea" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 -msgid "LDAP Authentication enabled" -msgstr "Autenticación con LDAP activada" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27 msgid "External company" msgstr "Empresa externa" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:66 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:60 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:99 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:129 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:101 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:131 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:27 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 @@ -2202,7 +2219,7 @@ msgstr "Preferencias de usuario" msgid "Start hour" msgstr "Hora de inicio" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:140 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:139 msgid "Assign materials" msgstr "Asignar materiales" @@ -2221,7 +2238,7 @@ msgstr "los filtros de formato no son válidos" msgid "ID" msgstr "NIF" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:349 msgid "Settings" msgstr "Preferencias" @@ -2263,7 +2280,7 @@ msgstr "Grupo de horas" msgid "Unallocated name" msgstr "Nombre no asignado" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:895 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:923 msgid "Move up" msgstr "Mover arriba" @@ -2276,14 +2293,14 @@ msgid "Subcontract communication date" msgstr "Fecha de comunicación de la subcontratación" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:281 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:263 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:359 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:269 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:365 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:131 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:134 msgid "Scheduling" msgstr "Planificación" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:126 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:128 msgid "Dependencies have priority" msgstr "Las dependencias tienen prioridad" @@ -2315,9 +2332,9 @@ msgstr "Página arriba" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:915 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:910 #: libreplan-webapp/src/main/webapp/orders/_list.zul:35 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:159 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:161 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53 msgid "State" @@ -2327,11 +2344,11 @@ msgstr "Estado" msgid "Must start after" msgstr "Debe empezar después" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1306 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1315 msgid "Confirm change" msgstr "Confirmar cambio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:840 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:848 msgid "You don't have permissions to edit this project" msgstr "No tiene permisos para editar este proyecto" @@ -2372,7 +2389,7 @@ msgstr "LibrePlan: Materiales" msgid "New task" msgstr "Nueva tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:192 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:191 msgid "The password for a new user cannot be empty" msgstr "La contraseña no puede ser vacía para un usuario nuevo" @@ -2462,7 +2479,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:343 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:349 msgid "Role property" msgstr "Propiedad del rol" @@ -2487,15 +2504,15 @@ msgstr "Asignación recomendada" msgid "Activation" msgstr "Activación" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310 msgid "Scenarios" msgstr "Escenarios" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:376 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:375 msgid "Materials saved" msgstr "Materiales guardados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1252 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238 msgid "" "This progress measurement can not be in current date, because it is " "consolidated. it is necessary to select other date." @@ -2503,7 +2520,7 @@ msgstr "" "Esta medida de progreso no puede estar en la fecha actual, porque está " "consolidada. Debe seleccionar otra fecha." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:334 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:37 msgid "Total Worked Hours By Resource In A Month" msgstr "Total horas trabajadas por recurso en un mes" @@ -2520,7 +2537,7 @@ msgstr "Buffer de tareas de entrada" msgid "At least one {0} sequence must be active" msgstr "Al menos una secuencia de {0} debe estar activa" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:130 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:26 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 @@ -2543,7 +2560,7 @@ msgstr "Debe seleccionar un escenario de origen" msgid "At least one {0} sequence is needed" msgstr "Se necesita al menos una secuencia de {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:37 msgid "Estimated/Planned Hours Per Task" msgstr "Horas por tarea estimadas/planificadas" @@ -2556,7 +2573,11 @@ msgstr "LibrePlan: Categorías de coste" msgid "Assigned" msgstr "Asignado" -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:45 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:244 +msgid "Use LDAP roles" +msgstr "Usar roles del LDAP" + +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:44 msgid "Details" msgstr "Detalles" @@ -2593,7 +2614,7 @@ msgstr "Fecha más temprana" msgid "LibrePlan: Work And Progress Per Task" msgstr "LibrePlan: trabajo y progreso por tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:350 msgid "Change Password" msgstr "Cambiar la contraseña" @@ -2601,14 +2622,15 @@ msgstr "Cambiar la contraseña" msgid "Projects" msgstr "Proyectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:264 -msgid "Confirm exit dialog" -msgstr "Diálogo para confirmar la salida" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/converters/ConverterFactory.java:64 msgid "Not found converter for {0}" msgstr "No se encontró un conversor para {0}" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:272 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1024 +msgid "Confirm exit dialog" +msgstr "Diálogo para confirmar la salida" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:70 msgid "Material assignments" msgstr "Asignaciones de materiales" @@ -2637,7 +2659,7 @@ msgstr "" msgid "Question" msgstr "Pregunta" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1249 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1235 msgid "" "This progress measurement can not be changed or removed, because it is " "consolidated. It is needed to remove its consolidation." @@ -2696,7 +2718,7 @@ msgstr "Registro de trabajo" msgid "Output format" msgstr "Formato de salida" -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:44 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:47 msgid "Print" msgstr "Imprimir" @@ -2731,25 +2753,24 @@ msgstr "El esfuerzo no puede ser nulo" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:41 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:138 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:137 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:70 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:80 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:85 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:157 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:88 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:142 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:141 #: libreplan-webapp/src/main/webapp/templates/templates.zul:139 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:100 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:379 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:387 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:50 -#: libreplan-webapp/src/main/webapp/planner/order.zul:73 -#: libreplan-webapp/src/main/webapp/planner/order.zul:134 -#: libreplan-webapp/src/main/webapp/planner/order.zul:169 +#: libreplan-webapp/src/main/webapp/planner/order.zul:131 +#: libreplan-webapp/src/main/webapp/planner/order.zul:166 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:91 #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42 -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:48 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:81 msgid "Cancel" msgstr "Cancelar" @@ -2778,8 +2799,8 @@ msgstr "Lista de máquinas" msgid "CPI" msgstr "CPI" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:687 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:695 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:907 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:318 msgid "You don't have read access to this project" msgstr "No tiene acceso de lectura a este proyecto" @@ -2848,11 +2869,11 @@ msgstr "nombre" msgid "Delete selected task" msgstr "Borrar tarea seleccionada" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java:130 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java:126 msgid "{0} (max: {1})" msgstr "{0} (máx: {1})" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:470 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:471 msgid "end" msgstr "fin" @@ -2860,7 +2881,7 @@ msgstr "fin" msgid "Cost Category" msgstr "Categoría de coste" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:350 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:357 msgid "Role search query" msgstr "Consulta para la búsqueda de roles" @@ -2886,7 +2907,7 @@ msgstr "Editar tarea {0}" msgid "Start date cannot be null" msgstr "La fecha de inicio no puede ser nula" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304 msgid "Subcontracting" msgstr "Subcontratación" @@ -2894,7 +2915,7 @@ msgstr "Subcontratación" msgid "references" msgstr "referencias" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1278 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1264 msgid "Value is not valid, the Precision value must be exact " msgstr "El valor no es válido, el valor de precisión debe ser exacto " @@ -2914,7 +2935,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:855 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:863 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 " @@ -2957,7 +2978,7 @@ msgstr "LibrePlan: Cambiar la contraseña" msgid "please, select a label" msgstr "por favor, seleccione una etiqueta" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:123 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:125 msgid "Add profile" msgstr "Añadir perfil" @@ -2979,7 +3000,7 @@ msgstr "falta el código en los datos de versión de un calendario" msgid "Criterion name" msgstr "Nombre del criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:131 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:127 msgid "values are not valid, the values must not be null" msgstr "los valores no son válidos, no deben ser nulos" @@ -2997,7 +3018,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:127 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:132 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:132 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 @@ -3031,7 +3052,7 @@ msgid "the name must be not empty" msgstr "el nombre no puede ser vacío" #: libreplan-webapp/src/main/webapp/materials/materials.zul:85 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:71 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:72 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:27 msgid "Disabled" msgstr "Deshabilitado" @@ -3070,8 +3091,8 @@ msgstr "" "intentando crear unha plantilla a partir de una tarea nueva.\n" "Por favor guarde su proyecto antes de continuar." -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1114 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1129 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1109 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1124 msgid "{0} not supported yet" msgstr "{0} aún no soportado" @@ -3092,7 +3113,7 @@ msgstr "Algunas secuencias para borrar no existen" msgid "Resources Load" msgstr "Carga de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:214 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:241 msgid "Changes have been canceled" msgstr "Cambios cancelados" @@ -3100,7 +3121,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:297 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:299 msgid "Authentication" msgstr "Autenticación" @@ -3162,7 +3183,7 @@ msgstr "Propagación" msgid "Select start date" msgstr "Seleccionar fecha de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:877 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:885 msgid "Removed {0}" msgstr "{0} borrado" @@ -3181,7 +3202,7 @@ msgid "Group name" msgstr "Nombre del grupo" #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:59 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:98 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:100 msgid "Role name" msgstr "Nombre del rol" @@ -3223,11 +3244,11 @@ msgstr "Añadir hito" msgid "Assign selected items" msgstr "Asignar elementos seleccionados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:449 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:450 msgid "init" msgstr "inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1215 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1201 msgid "Add new progress measurement" msgstr "Añadir nueva medida de progreso" @@ -3235,7 +3256,7 @@ msgstr "Añadir nueva medida de progreso" msgid "Select for automatic queuing" msgstr "Seleccione para encolar automáticamente" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 msgid "Scenarios Management" msgstr "Administración de escenarios" @@ -3247,7 +3268,7 @@ msgstr "Proyecto {0} transferido" msgid "Create & Assign" msgstr "Crear y asignar" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1549 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1558 msgid "Not configurable" msgstr "No configurable" @@ -3255,7 +3276,7 @@ msgstr "No configurable" msgid "Advanced allocation" msgstr "Asignación avanzada" -#: libreplan-webapp/src/main/webapp/planner/order.zul:111 +#: libreplan-webapp/src/main/webapp/planner/order.zul:108 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:93 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:96 msgid "Consolidated" @@ -3290,7 +3311,7 @@ msgstr "LibrePlan: Acceso de usuarios" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:67 #: libreplan-webapp/src/main/webapp/orders/_list.zul:32 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:109 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:111 msgid "Customer" msgstr "Cliente" @@ -3305,17 +3326,19 @@ msgstr "Tipo de horas" msgid "criterion type name not specified" msgstr "nombre del tipo de criterio no especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:246 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:273 msgid "Cannot connect to LDAP server" msgstr "No se puede conectar al servidor de LDAP" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:220 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:219 msgid "Add Exception" msgstr "Añadir excepción" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:301 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:322 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:346 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:303 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:324 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:348 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:378 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:219 msgid "cannot be empty" msgstr "no puede ser vacío" @@ -3400,8 +3423,8 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:441 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:443 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:930 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:94 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 @@ -3429,7 +3452,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77 #: libreplan-webapp/src/main/webapp/materials/materials.zul:58 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:42 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:84 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66 @@ -3443,7 +3466,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:51 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:40 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:35 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 #: libreplan-webapp/src/main/webapp/orders/_list.zul:28 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:72 #: libreplan-webapp/src/main/webapp/templates/templates.zul:80 @@ -3494,11 +3517,11 @@ msgstr "Día de la semana" msgid "Companies List" msgstr "Lista de empresas" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1453 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1462 msgid "Stretches with Interpolation" msgstr "Tramos con interpolación" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:333 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:37 msgid "Hours Worked Per Resource" msgstr "Horas trabajadas por recurso" @@ -3588,22 +3611,22 @@ 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:198 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:225 msgid "Changes saved" msgstr "Cambios guardados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1258 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1266 msgid "See scheduling" msgstr "Ver planificación" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:341 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:328 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:331 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:107 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110 msgid "Progress measurements" msgstr "Medidas de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1214 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1200 msgid "Add measure" msgstr "Añadir medida" @@ -3632,7 +3655,7 @@ msgstr "Relación" msgid "End" msgstr "Fin" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1360 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1346 msgid "The date is not valid, the date must be not empty" msgstr "La fecha no es válida, no debe ser vacía" @@ -3641,7 +3664,7 @@ msgid "User login name" msgstr "Nombre de usuario" #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:534 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 msgid "Cost Categories" msgstr "Categorías de coste" @@ -3667,7 +3690,7 @@ msgstr "Lista de usuarios" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:27 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:55 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:57 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:56 msgid "Task quality forms" msgstr "Formularios de calidad de tarea" @@ -3684,7 +3707,7 @@ msgstr "Tipos de progreso" msgid "Cost category" msgstr "Categoría de coste" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:700 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:727 msgid "It can not be deleted. At least one sequence is necessary." msgstr "No se puede borrar. Al menos una secuencia es necesaria." @@ -3734,26 +3757,26 @@ msgstr "Añadir nuevo campo de tipo de etiqueta" msgid "Time finish cannot be null" msgstr "La hora de fin no puede ser nula" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:116 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:118 msgid "Customer reference" msgstr "Referencia de cliente" #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:688 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:841 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:891 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:900 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:927 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:696 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:849 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:908 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:935 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:146 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:319 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:360 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:309 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:319 msgid "Information" msgstr "Información" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:926 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:934 msgid "Sorry, you do not have permissions to access this project" msgstr "Lo sentimos, no tiene permisos para acceder a este proyecto" @@ -3773,6 +3796,10 @@ msgstr "no se puede pasar mientras el elemento no anterior sea pasado." msgid "New hours group " msgstr "Nuevo grupo de horas " +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45 +msgid "Please remember that only saved changes will be printed" +msgstr "Por favor recuerda que sólo los cambios guardados serán impresos" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:464 msgid "Assign element to queue manually" msgstr "Asignar elemento a cola manualmente" @@ -3785,11 +3812,11 @@ msgstr "Editar Plantilla" msgid "Resource: {0} " msgstr "Recurso: {0} " -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:358 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:360 msgid "percentage cannot be duplicated" msgstr "el porcentaje no puede estar duplicado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 msgid "Work Hours" msgstr "Horas de trabajo" @@ -3843,8 +3870,8 @@ msgstr "Asignaciones de trabajador" #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:154 #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:182 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java:173 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:305 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:307 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:328 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:221 msgid "{0} already exists" msgstr "{0} ya existe" @@ -3862,20 +3889,20 @@ msgid "Code " msgstr "Código" #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:66 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:65 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:66 msgid "Password confirmation" msgstr "Confirmación de contraseña" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:88 -msgid "Work Report" -msgstr "Parte de trabajo" - #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:71 msgid "Indent selected task" msgstr "Indentar tarea seleccionada" +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:88 +msgid "Work Report" +msgstr "Parte de trabajo" + #: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:189 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:330 #: libreplan-webapp/src/main/webapp/common/configuration.zul:135 msgid "Unit Measures" msgstr "Unidades de medida" @@ -3885,11 +3912,11 @@ msgstr "Unidades de medida" msgid "Show progress" msgstr "Mostrar progreso" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:142 msgid "Work" msgstr "Trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:297 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:298 msgid "" "Error saving the project\n" "{0}" @@ -3911,9 +3938,9 @@ msgstr "LibrePlan: Máquinas" #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:630 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:298 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:299 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:121 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1296 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305 msgid "Error" msgstr "Error" @@ -3954,7 +3981,7 @@ msgstr "" "criterionType" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationCommand.java:67 -#: libreplan-webapp/src/main/webapp/planner/order.zul:83 +#: libreplan-webapp/src/main/webapp/planner/order.zul:80 msgid "Progress consolidation" msgstr "Consolidación de progreso" @@ -3983,7 +4010,7 @@ msgstr "Recurso limitante" msgid "Task Information" msgstr "Información de la tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:140 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:145 msgid "Hours Group at " msgstr "Grupo de horas en " @@ -4006,7 +4033,7 @@ msgstr "un día está vacío" msgid "Budgeted Cost Work Scheduled" msgstr "Coste de trabajo presupuestado planificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 msgid "Changes applied" msgstr "Cambios aplicados" @@ -4038,7 +4065,7 @@ msgstr "Desviación en coste" msgid "criterion type does not allow resource hierarchy" msgstr "el tipo de criterio no permite jerarquía de recursos" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:150 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:152 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:95 msgid "Total" @@ -4061,8 +4088,8 @@ msgstr "Editar tarea: {0}" msgid "Select destination" msgstr "Seleccionar destino" -#: libreplan-webapp/src/main/webapp/planner/order.zul:92 -#: libreplan-webapp/src/main/webapp/planner/order.zul:98 +#: libreplan-webapp/src/main/webapp/planner/order.zul:89 +#: libreplan-webapp/src/main/webapp/planner/order.zul:95 msgid "Check consolidated progresses" msgstr "Marcar progresos consolidados" @@ -4090,7 +4117,7 @@ msgid "Apply tab changes" msgstr "Aplicar cambios de la pestaña" #: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:93 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:171 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:170 msgid "passwords don't match" msgstr "las contraseñas no conciden" @@ -4118,7 +4145,7 @@ msgstr "nuevo hito" msgid "Value last progress reported" msgstr "Valor último progreso notificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306 msgid "Report Progress" msgstr "Notificar progreso" @@ -4126,7 +4153,7 @@ msgstr "Notificar progreso" msgid "Show dependencies" msgstr "Mostrar dependencias" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:347 msgid "Schedule from start to deadline" msgstr "Planificar desde el principio a la fecha límite" @@ -4162,7 +4189,7 @@ msgstr "LibrePlan: Días de excepción" msgid "LibrePlan: Work Hours" msgstr "LibrePlan: Horas de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 msgid "LibrePlan Configuration" msgstr "LibrePlan: Configuración" @@ -4212,7 +4239,7 @@ msgstr "Tipo de excepción" msgid "In the available periods {0} only {1} hours are available." msgstr "En los períodos disponibles {0} solo {1} horas están disponibles." -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:118 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:120 msgid "Association with profiles" msgstr "Asociación con perfiles" @@ -4246,11 +4273,11 @@ msgstr "Preferencias de la aplicación" msgid "Average of estimated hours" msgstr "Media de horas estimadas" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:270 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:272 msgid "Base" msgstr "Base" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:682 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:683 msgid "" "You can not remove the task \"{0}\" because of this or any of its children " "are already in use in some work reports" @@ -4270,7 +4297,7 @@ msgstr "Seleccionar origen" msgid "Worker deleted" msgstr "Trabajador borrado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:733 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:760 msgid "Select entity, please" msgstr "Seleccionar entidad, por favor" @@ -4362,7 +4389,7 @@ msgstr "El nombre del campo debe ser único, no nulo y no vacío" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:382 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:136 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:157 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:84 msgid "Position" msgstr "Posición" @@ -4388,7 +4415,7 @@ msgstr "Recursos limitantes (proyecto)" msgid "A description field of the same name already exists." msgstr "Ya existe un campo de descripción con el mismo nombre." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1177 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1163 msgid "" "Progress measurements that are reported by quality forms can not be removed" msgstr "" @@ -4435,7 +4462,7 @@ 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:248 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:250 msgid "Configuration" msgstr "Configuración" @@ -4457,11 +4484,11 @@ msgid "Select type" msgstr "Seleccione tipo" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:678 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:911 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:906 msgid "Hours invested" msgstr "Horas invertidas" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:324 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:326 msgid "Authorization" msgstr "Autorización" @@ -4471,7 +4498,7 @@ msgid "" msgstr "" "El nombre no es válido, ya hay otro tipo de progreso con el mismo nombre. " -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:319 msgid "Project saved" msgstr "Proyecto guardado" @@ -4491,7 +4518,7 @@ msgstr "recurso del criterio satisfecho no especificado" msgid "Derived exception" msgstr "Excepción derivada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:292 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298 msgid "Machines" msgstr "Máquinas" @@ -4499,7 +4526,7 @@ msgstr "Máquinas" msgid "Unit Measures List" msgstr "Lista de unidades de medida" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:153 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:149 msgid "Couldn't find element: {0}" msgstr "No se pudo encontrar el elemento: {0}" @@ -4512,7 +4539,7 @@ msgstr "Debe seleccionar un escenario de destino" msgid "unit type code not found" msgstr "código de tipo de unidad no encontrado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:348 msgid "My account" msgstr "Mi cuenta" @@ -4528,7 +4555,7 @@ msgstr "Vista de la compañía" msgid "Both" msgstr "Ambos" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:758 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:764 msgid "Not editable for containing more that an hours group." msgstr "No editable por contener más de un grupo de horas." @@ -4542,7 +4569,7 @@ msgid "Limiting resource" msgstr "Recurso limitante" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/calendar/CalendarAllocationCommand.java:58 -#: libreplan-webapp/src/main/webapp/planner/order.zul:146 +#: libreplan-webapp/src/main/webapp/planner/order.zul:143 msgid "Calendar allocation" msgstr "Asignación de calendario" @@ -4558,7 +4585,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/materials/materials.zul:84 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:32 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:120 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:119 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33 msgid "Category" msgstr "Categoría" @@ -4576,7 +4603,7 @@ msgstr "[genérico todos los trabajadores]" msgid "Category data" msgstr "Datos de categoría" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:103 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:102 msgid "Search" msgstr "Buscar" @@ -4617,11 +4644,11 @@ msgstr "Borrar calendario" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1700 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:425 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:651 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1323 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:669 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1331 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:670 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:254 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:337 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:259 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:251 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:141 msgid "must be lower than finish date" msgstr "debe ser menor que la fecha de fin" @@ -4651,7 +4678,7 @@ msgstr "Fecha último progreso notificado" msgid "Could not load any resource" msgstr "No se pudo cargar un recurso" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:335 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:341 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:37 msgid "Work And Progress Per Project" msgstr "Trabajo y progreso por proyecto" @@ -4716,8 +4743,8 @@ msgstr "Datos de la empresa" msgid "Unit type code cannot be empty" msgstr "El código del tipo de unidad no puede ser vacío" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:184 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:183 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318 msgid "Users" msgstr "Usuarios" @@ -4833,11 +4860,11 @@ msgstr "Filtrar por trabajadores" msgid "Load due to current project" msgstr "Carga debido al proyecto actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1314 msgid "You are going to change the assignment function. Are you sure?" msgstr "Va a cambiar la función de asignación. ¿Está seguro?" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:328 msgid "Exception Days" msgstr "Días de excepción" @@ -4858,13 +4885,13 @@ msgstr "Actualización incompatible: el recurso almacenado no es de tipo: {0}" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:114 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:40 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:135 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:134 #: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:67 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:78 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:83 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 #: libreplan-webapp/src/main/webapp/templates/templates.zul:137 msgid "Save & Continue" msgstr "Guardar y continuar" @@ -4873,7 +4900,7 @@ msgstr "Guardar y continuar" msgid "LibrePlan: Work And Progress Per Project" msgstr "LibrePlan: Trabajo y Progreso por Proyecto" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:90 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:92 msgid "Scheduling mode" msgstr "Modo de planificación" @@ -4913,11 +4940,16 @@ msgstr "ACWP" msgid "The periods available depend on the resource's calendar." msgstr "Los períodos de disponibilidad dependen del calendario del recurso." +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:83 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 +msgid "Authentication type" +msgstr "Tipo de autenticación" + #: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:55 msgid "START" msgstr "INICIO" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:342 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:350 msgid "Schedule from the deadline to start" msgstr "Planificar desde la fecha límite al principio" @@ -4929,8 +4961,9 @@ msgstr "asignación genérica de máquinas" msgid "Non limiting resource assignation" msgstr "Asignación de recursos no limitantes" -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:87 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:86 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75 +#: libreplan-webapp/src/main/webapp/planner/order.zul:70 #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68 msgid "Back" msgstr "Atrás" @@ -4949,11 +4982,11 @@ msgstr "Administración" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1682 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:634 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1306 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:651 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1314 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:652 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:237 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:318 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:242 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:234 msgid "must be greater than start date" msgstr "debe ser mayor que la fecha de inicio" @@ -4978,7 +5011,7 @@ msgstr "horas trabajadas" msgid "Unit measure name" msgstr "Nombre de la unidad de medida" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:144 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:140 msgid "cannot include a progress of the same progress type twice" msgstr "no se puede asignar un progreso del mismo tipo dos veces" @@ -5035,7 +5068,7 @@ msgstr "Total de horas de tarea" msgid "Removed calendar \"{0}\"" msgstr "Borrado calendario \"{0}\"" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1063 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1071 msgid "Create project" msgstr "Crear proyecto" @@ -5050,7 +5083,7 @@ msgstr "" "Permitir valores múltiples para este tipo de criterio en el mismo período de " "tiempo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1294 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1280 msgid "" "The date is not valid, the date must be unique for this progress assignment" msgstr "La fecha no es válida, debe ser única para esta asignación de progreso" @@ -5087,11 +5120,11 @@ msgstr "sí" msgid "Root calendar" msgstr "Calendario raíz" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:263 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:265 msgid "Port" msgstr "Puerto" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:862 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:870 msgid "" "Deleting this subcontracted project, you are going to lose the relation to " "report progress. Are you sure?" @@ -5130,7 +5163,7 @@ msgstr "Asignación de categoría de coste" msgid "missing code in a hour cost" msgstr "falta código en un coste por hora" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:870 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:858 msgid "All workers" msgstr "Todos los trabajadores" @@ -5152,12 +5185,14 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:121 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:123 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:311 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:207 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:307 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1492 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1516 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:115 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:168 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:738 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:765 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:134 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:58 @@ -5186,7 +5221,6 @@ msgstr "" #: libreplan-webapp/src/main/webapp/users/_editUser.zul:46 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:37 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:45 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:39 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96 msgid "cannot be null or empty" @@ -5205,7 +5239,7 @@ msgstr "Código nuevo" msgid "The progress type cannot be modified" msgstr "El tipo de progreso no puede ser modificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:392 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:394 msgid "Calculate Resources per Day" msgstr "Calcular recursos por día" @@ -5219,7 +5253,7 @@ msgstr "Estimación del coste pendiente" #: libreplan-webapp/src/main/webapp/materials/materials.zul:83 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:29 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 msgid "Unit type" msgstr "Tipo de unidad" @@ -5240,7 +5274,7 @@ msgstr "Esta máquina ya ha sido borrada por otro usuario" msgid "Calendar data" msgstr "Datos del calendario" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:294 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300 msgid "Work Reports" msgstr "Partes de trabajo" @@ -5279,8 +5313,8 @@ msgstr "Ya existe otra etiqueta con el mismo nombre" msgid "Customer Reference" msgstr "Referencia de cliente" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:134 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:147 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:130 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:143 msgid "spread values are not valid, at least one value should be true" msgstr "" "los valores de propagación no son válidos, al menos uno debe ser verdadero" @@ -5313,12 +5347,12 @@ msgstr "" "El calendario por defecto no se puede. Por favor, cambie antes el calendario " "por defecto en la ventana de configuración." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:600 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:601 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:677 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:908 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:903 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:46 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:49 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:48 #: libreplan-webapp/src/main/webapp/templates/templates.zul:63 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 msgid "Progress" @@ -5332,7 +5366,7 @@ msgstr "" "Este tipo de criterio no se puede borrar porque tiene asignaciones a " "proyectos o recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1224 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1210 msgid "All progress types have already been assigned." msgstr "Todos los tipos de progreso ya han sido asignados." @@ -5344,7 +5378,7 @@ msgstr "Precio por hora" msgid "Project: {0} " msgstr "Proyecto: {0} " -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:315 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 msgid "Calendars" msgstr "Calendarios" @@ -5383,7 +5417,7 @@ msgstr "LibrePlan: Partes de trabajo" msgid "Error on showing delete confirm" msgstr "Error al mostrar la confirmación de borrado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:623 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:625 msgid "Sum of all rows" msgstr "Suma de todas las filas" @@ -5434,7 +5468,7 @@ msgstr "Nombre de la unidad de configuración de cada trabajador" msgid "Active" msgstr "Activo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1261 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1247 msgid "This progress measurement can not be in " msgstr "Esta medida de progreso no puede estar en " @@ -5442,7 +5476,7 @@ msgstr "Esta medida de progreso no puede estar en " msgid "Inherited labels" msgstr "Etiquetas heredadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1246 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1232 msgid "" "This progress can not be changed or removed, because it has got consolidated " "progress. It is needed to remove the consolidation on all its progress." @@ -5452,12 +5486,12 @@ msgstr "" "progreso." #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:917 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:945 msgid "Unindent" msgstr "Desindentar" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:935 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1384 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1370 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" @@ -5485,7 +5519,7 @@ msgstr "Precisión" msgid "missing code in a work report line" msgstr "falta código en una línea de parte de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:928 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:937 msgid "Efforts" msgstr "Esfuerzos" @@ -5493,7 +5527,7 @@ msgstr "Esfuerzos" msgid "Show all reported hours" msgstr "Mostrar todas las horas notificadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:102 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:113 msgid "Projects List" @@ -5512,7 +5546,7 @@ msgstr "Lista de proyectos" #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:46 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:46 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:80 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:82 msgid "Generate code" msgstr "Generar código" @@ -5524,14 +5558,10 @@ msgstr "Estado de planificación" msgid "This template can not be removed because it has applications." msgstr "Esta plantilla no se puede borrar porque tiene aplicaciones." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:486 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:513 msgid "The code sequence is already in use and it can not be updated." msgstr "El código de secuencia ya está en uso y no se puede actualizar." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:332 -msgid "Import LDAP roles" -msgstr "Importar roles del LDAP" - #: libreplan-webapp/src/main/webapp/settings/settings.zul:43 msgid "Personal Data" msgstr "Datos personales" @@ -5548,7 +5578,7 @@ msgstr "LibrePlan: Horas Trabajadas Por Recurso" msgid "Number of iterations should be between 1 and " msgstr "El número de iteraciones debería estar entre 1 y " -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:142 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:149 msgid "Scenarios must be enabled as more elements than master exist" msgstr "" "Los escenarios deben estar habilitados ya que existen más elementos que " @@ -5568,7 +5598,7 @@ msgstr "Tarea {0} : El grupo de tareas tiene un tipo incompatible con {1}" msgid "Profiles authorization" msgstr "Autorización de perfiles" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:293 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 msgid "Virtual Workers Groups" msgstr "Grupos de trabajadores virtuales" @@ -5632,9 +5662,9 @@ msgid "All projects" msgstr "Todos los proyectos" #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:41 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:60 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:61 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:83 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:284 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:286 msgid "Password" msgstr "Contraseña" @@ -5643,7 +5673,7 @@ msgstr "Contraseña" msgid "Observations" msgstr "Observaciones" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:942 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:950 msgid "Edit project" msgstr "Editar proyecto" @@ -5682,7 +5712,7 @@ msgstr "Color" msgid "Current password is incorrect" msgstr "La contraseña actual es incorrecta" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:367 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:366 msgid "Cannot insert material in general view. Please, select a category" msgstr "" "No se puede insertar material en la vista general. Por favor, seleccione una " @@ -5705,9 +5735,8 @@ msgstr "Borrar {0} \"{1}\". ¿Está seguro?" #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:86 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:98 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:48 -#: libreplan-webapp/src/main/webapp/planner/order.zul:70 -#: libreplan-webapp/src/main/webapp/planner/order.zul:131 -#: libreplan-webapp/src/main/webapp/planner/order.zul:166 +#: libreplan-webapp/src/main/webapp/planner/order.zul:128 +#: libreplan-webapp/src/main/webapp/planner/order.zul:163 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:89 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:79 #: libreplan-webapp/src/main/webapp/planner/main.zul:66 @@ -5715,14 +5744,14 @@ msgid "Accept" msgstr "Aceptar" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:81 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:259 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:266 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:273 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:280 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:308 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:339 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:346 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:261 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:268 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:275 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:282 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:310 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:345 #: libreplan-webapp/src/main/webapp/common/configuration.zul:353 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:361 msgid "Example: {0}" msgstr "Ejemplo: {0}" @@ -5746,7 +5775,7 @@ msgstr "Calculado" msgid "Completed: {0}% " msgstr "Completado: {0}% " -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1181 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1167 msgid "Calculated progress measurement can not be removed" msgstr "Las medidas de progreso calculadas no se pueden borrar" @@ -5849,9 +5878,9 @@ msgstr "" #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:41 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:26 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:115 #: libreplan-webapp/src/main/webapp/orders/_list.zul:29 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:76 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:77 #: libreplan-webapp/src/main/webapp/templates/templates.zul:85 #: libreplan-webapp/src/main/webapp/templates/_list.zul:26 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 @@ -5874,7 +5903,7 @@ msgstr "Mostrar las asignaciones de recursos" msgid "Assignation type" msgstr "Tipo de asignación" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:367 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:369 msgid "Calculate Workable Days" msgstr "Calcular días laborables" @@ -5904,7 +5933,7 @@ msgstr "Actualizar excepción" msgid "Operation cannot be done" msgstr "No se puede efectuar la operación" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:138 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 msgid "Budget" msgstr "Presupuesto" @@ -6001,7 +6030,7 @@ msgstr "Carga" #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:43 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:59 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:120 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:122 #: libreplan-webapp/src/main/webapp/templates/templates.zul:101 #: libreplan-webapp/src/main/webapp/templates/_list.zul:32 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 @@ -6022,11 +6051,11 @@ msgid "already exists an allocation for criteria {0}" msgstr "ya existe una asignación para los criterios {0}" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:283 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:294 msgid "Project Templates" msgstr "Plantillas de proyectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:347 msgid "Forward" msgstr "Adelante" @@ -6044,7 +6073,7 @@ msgstr "Número de aplicaciones finalizadas" msgid "Unnasigned" msgstr "No asignado" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:179 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:178 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:74 #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:165 @@ -6071,7 +6100,7 @@ msgstr "El porcentaje de duración debería estar entre 0 y 100" msgid "Multiple values per resource" msgstr "Múltiples valores por recurso" -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:62 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:60 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58 msgid "Split" msgstr "Dividir" @@ -6094,7 +6123,7 @@ msgstr "Compatible con navegadores Chrome, Firefox, Safari y Epiphany" #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:45 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:56 #: libreplan-webapp/src/main/webapp/orders/_list.zul:30 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:94 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:96 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:51 msgid "Starting date" msgstr "Fecha de inicio" @@ -6107,7 +6136,7 @@ msgstr "Añadir materiales" msgid "Load 100%" msgstr "Carga 100%" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:934 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:943 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:84 msgid "Function" msgstr "Función" @@ -6117,7 +6146,7 @@ msgstr "Función" msgid "date in future" msgstr "fecha en el futuro" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:851 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:855 msgid "New project version" msgstr "Nueva versión de proyecto" @@ -6134,8 +6163,8 @@ msgstr "Formato" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:364 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1226 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:483 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1234 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:484 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:77 #: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:537 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:78 @@ -6165,7 +6194,7 @@ msgstr "Editar" msgid "Init date" msgstr "Fecha de inicio" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:104 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:106 msgid "Responsible" msgstr "Responsable" @@ -6173,7 +6202,7 @@ msgstr "Responsable" msgid "New password" msgstr "Nueva contraseña" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:352 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:354 msgid "percentage must be in range (0,100]" msgstr "el porcentaje debe pertenecer al rango (0,100]" @@ -6213,7 +6242,7 @@ msgstr "Árbol {0} aplanado satisfactoriamente" #: libreplan-webapp/src/main/webapp/materials/materials.zul:82 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:30 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:119 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 msgid "Unit price" msgstr "Precio de la unidad" @@ -6301,8 +6330,8 @@ msgstr "Noviembre" msgid "Enable/Disable" msgstr "Habilitar/Deshabilitar" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1282 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1304 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1268 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1290 msgid "" "Value is not valid, the value must be greater than the value of the previous " "progress." @@ -6345,7 +6374,7 @@ msgstr "Criterio" msgid "unl" msgstr "ili" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:290 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:292 msgid "Test LDAP connection" msgstr "Probar la conexión con el LDAP" @@ -6363,11 +6392,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:172 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:177 msgid "Create project from Template" msgstr "Crear proyecto a partir de plantilla" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:417 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:418 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" @@ -6385,7 +6414,7 @@ msgstr "debe seleccionar un tipo de autorización" msgid "Must start after (days since beginning project)" msgstr "Debe empezar después de (días desde el inicio del proyecto)" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:850 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:854 msgid "" "Confirm creating a new project version for this scenario and derived. Are " "you sure?" @@ -6398,7 +6427,6 @@ msgstr "" #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:72 #: libreplan-webapp/src/main/webapp/materials/materials.zul:45 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:73 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:59 @@ -6440,7 +6468,7 @@ msgstr "Debe seleccionar el tipo de excepción" #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:62 #: libreplan-webapp/src/main/webapp/orders/_list.zul:31 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:99 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:101 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46 msgid "Deadline" msgstr "Fecha límite" @@ -6449,7 +6477,7 @@ msgstr "Fecha límite" msgid "Tasks" msgstr "Tareas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 msgid "Subcontracted Tasks" msgstr "Tareas subcontratadas" @@ -6480,7 +6508,7 @@ msgstr "Tipo de etiqueta" msgid "Advanced Allocation" msgstr "Asignación avanzada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 msgid "Administration / Management" msgstr "Administración / Gestión" @@ -6492,7 +6520,7 @@ msgstr "Número de iteraciones" msgid "Template Tree" msgstr "Árbol de plantillas" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:447 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:449 #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 msgid "Alpha" msgstr "Alfa" @@ -6550,7 +6578,7 @@ msgstr "Tipo de formulario de calidad" msgid "work report has not this label type assigned" msgstr "el parte de trabajo no tiene asignado este tipo de etiqueta" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1192 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1201 msgid "Limiting assignment" msgstr "Asignación limitante" @@ -6570,7 +6598,7 @@ msgstr " horas" msgid "The name of the criterion is empty." msgstr "El nombre del criterio está vacío." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:132 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:145 msgid "Limiting Resources Planning" @@ -6594,7 +6622,7 @@ msgstr "La fecha de inicio no puede ser nula" msgid "All project tasks" msgstr "Todas las tareas del proyecto" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:367 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:375 msgid "LDAP Roles (separated by ;)" msgstr "Roles del LDAP (separados por ;)" @@ -6629,7 +6657,7 @@ msgstr "Ayuda sobre la identificación (abre una ventana nueva)" msgid "The length must be greater than 0, and not null." msgstr "La longitud debe ser mayor que cero y no nula." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:54 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:49 msgid "Not a valid effort duration" msgstr "No es una duración de esfuerzo válida" @@ -6663,13 +6691,13 @@ msgstr "No se pudo encontrar el criterio {0}" msgid "Apply filtering to tasks satisfying required criteria" msgstr "Aplicar filtrado a las tareas que satisfacen los criterios requeridos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:345 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:37 msgid "Task Scheduling Status In Project" msgstr "Estado de planificación de tareas en un proyecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:261 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:863 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:263 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:871 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:356 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313 msgid "Confirm" @@ -6730,22 +6758,22 @@ msgstr "Etiquetas sin herencia" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:451 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:324 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:272 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:293 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:271 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:289 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:163 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1242 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1250 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1207 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1193 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:201 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:333 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:406 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:646 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:648 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:408 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:955 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:961 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:983 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:989 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:264 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:84 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43 @@ -6760,20 +6788,20 @@ msgstr "Etiquetas sin herencia" #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99 #: libreplan-webapp/src/main/webapp/materials/materials.zul:104 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:117 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:116 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:68 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:107 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:137 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:109 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:139 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:40 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:46 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:213 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212 #: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:59 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:57 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67 #: libreplan-webapp/src/main/webapp/templates/_list.zul:53 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55 @@ -6833,6 +6861,10 @@ msgstr "Inglés" msgid "Russian" msgstr "Ruso" +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:39 +msgid "Portuguese" +msgstr "Portugués" + #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:172 msgid "unlimited" msgstr "ilimitado" diff --git a/libreplan-webapp/src/main/resources/i18n/gl.po b/libreplan-webapp/src/main/resources/i18n/gl.po index 31a7c0b82..9ee03057c 100644 --- a/libreplan-webapp/src/main/resources/i18n/gl.po +++ b/libreplan-webapp/src/main/resources/i18n/gl.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-11 09:11+0100\n" -"PO-Revision-Date: 2011-11-11 09:25+0100\n" +"POT-Creation-Date: 2011-11-25 11:40+0100\n" +"PO-Revision-Date: 2011-11-25 11:47+0100\n" "Last-Translator: Manuel Rego Casasnovas \n" "Language-Team: Galician <>\n" "Language: gl\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:336 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:341 msgid "Group path" msgstr "Path do grupo" @@ -85,12 +85,13 @@ msgstr "Crear traballador virtual" #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:40 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:28 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:81 #: libreplan-webapp/src/main/webapp/materials/materials.zul:61 #: libreplan-webapp/src/main/webapp/materials/materials.zul:86 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:29 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:88 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68 @@ -148,12 +149,12 @@ msgstr "Parte de traballo borrado con éxito" msgid "It can not be empty" msgstr "Non pode estar baleiro" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 #: libreplan-webapp/src/main/webapp/materials/materials.zul:33 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:97 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:53 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:145 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:55 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:147 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:54 #: libreplan-webapp/src/main/webapp/templates/templates.zul:66 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22 @@ -200,13 +201,13 @@ msgid "Summary" msgstr "Resumo" #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:445 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 #: libreplan-webapp/src/main/webapp/templates/templates.zul:67 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53 msgid "Quality Forms" msgstr "Formularios de calidade" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337 msgid "Reports" msgstr "Informes" @@ -238,8 +239,8 @@ msgstr "A data do tramo debe ser maior ou igual cá data de inicio da tarefa: " msgid "Dedication chart" msgstr "Gráfico de dedicación" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:702 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:729 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:689 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:716 msgid "Progress that are reported by quality forms can not be modified" msgstr "" "O progreso notificado por formularios de calidade non se pode modificar" @@ -260,7 +261,7 @@ msgstr "Non se pode borrar ese material porque está asignado a un proxecto." msgid "Remove limiting resource element" msgstr "Borrar elemento de recurso limitante" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:136 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:150 msgid "Resource Usage" @@ -275,7 +276,7 @@ msgid "Unassign" msgstr "Desasignar" #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:157 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:296 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:302 msgid "Companies" msgstr "Empresas" @@ -283,7 +284,7 @@ msgstr "Empresas" msgid "Manual assignment" msgstr "Asignación manual" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:75 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:74 msgid "Quality form items list" msgstr "Lista de elementos do formulario de calidade" @@ -304,7 +305,7 @@ msgstr "Crear {0}: {1}" msgid "generic workers allocation" msgstr "Asignación xenérica de traballadores" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:890 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:898 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:308 msgid "The project has no scheduled elements" msgstr "O proxecto no ten elementos planificados" @@ -348,7 +349,7 @@ msgstr "Capacidade de recursos" msgid "changing perspective" msgstr "cambio de perspectiva" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:31 msgid "Transfer Projects Between Scenarios" msgstr "Transferir proxectos entre escenarios" @@ -371,11 +372,11 @@ msgid "Project Name" msgstr "Nome do proxecto" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:938 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:966 msgid "Indent" msgstr "Indentar" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:312 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:314 msgid "Save passwords in database" msgstr "Gardar contrasinais na base de datos" @@ -409,7 +410,7 @@ msgstr "Lista de excepcións" msgid "Locations" msgstr "Ubicacións" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:78 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:77 msgid "New quality form item" msgstr "Novo elemento de formulario de calidade" @@ -417,7 +418,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:242 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:269 msgid "LDAP connection was successful" msgstr "A conexión co LDAP foi realizada con éxito" @@ -425,11 +426,6 @@ msgstr "A conexión co LDAP foi realizada con éxito" msgid "Login name" msgstr "Nome de usuario" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:81 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 -msgid "LibrePlan user" -msgstr "Usuario de LibrePlan" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:84 msgid "{0} List" msgstr "{0} Lista" @@ -459,7 +455,7 @@ msgstr "" "aplicables a este recurso" #: libreplan-webapp/src/main/webapp/orders/_edition.zul:50 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:53 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:52 #: libreplan-webapp/src/main/webapp/templates/templates.zul:65 msgid "Criterion Requirement" msgstr "Criterio requirido" @@ -510,6 +506,10 @@ msgstr "" "non hai recursos cos criterios solicitados: {0}. Por tanto, non se pode " "engadir a asignación xenérica" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:334 +msgid "Role search strategy" +msgstr "Estratexia para a búsqueda de roles" + #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:478 msgid "Error on showing warning message removing calendar: " msgstr "Erro ao mostrar mensaxe de advertencia borrando un calendario: " @@ -525,11 +525,11 @@ msgstr "o nome da categoría de materiais debe ser único. Xa está en uso" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:44 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:47 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:46 msgid "Imputed hours" msgstr "Horas imputadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:37 msgid "Project Costs Per Resource" msgstr "Custos do proxecto por recurso" @@ -567,11 +567,15 @@ msgstr "" "{0} non é válido, criterionType solápase con outro criterionSatisfaction do " "mesmo criterionType" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:336 +msgid "Group strategy" +msgstr "Estratexia de grupo" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 msgid "Work Report Lines" msgstr "Liñas do parte de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1546 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1555 msgid "Configure" msgstr "Configurar" @@ -582,7 +586,7 @@ msgstr "Outubro" #: libreplan-webapp/src/main/webapp/settings/settings.zul:58 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:36 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:58 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:50 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:51 msgid "First name" msgstr "Nome" @@ -597,8 +601,8 @@ msgstr "Campos de texto complementario" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:210 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:450 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:827 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:291 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:835 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 msgid "Confirm deleting {0}. Are you sure?" msgstr "Confirmar o borrado de {0}. ¿Está seguro?" @@ -607,11 +611,11 @@ msgstr "Confirmar o borrado de {0}. ¿Está seguro?" msgid "Work Reports List" msgstr "Lista de partes de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:313 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319 msgid "Accounts" msgstr "Contas" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:85 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:87 msgid "External code" msgstr "Código externo" @@ -637,7 +641,7 @@ msgstr "Materiales requiridos" msgid "resources per day must be not empty and bigger than zero" msgstr "os recursos por día deben ser non baleiros e maiores que cero" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:341 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:349 msgid "Backwards" msgstr "Atrás" @@ -650,7 +654,7 @@ msgstr "Versión" msgid "Apply filtering to resources satisfying required criteria" msgstr "Aplicar filtrado aos recursos que satisfán os criterios requeridos" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:106 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:105 msgid "Up" msgstr "Arriba" @@ -698,6 +702,10 @@ msgstr "" "O valor non é válido, o valor máximo por defecto debe ser maior có valor de " "precisión " +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:245 +msgid "missing worker code in the work report" +msgstr "falta código de traballador nun parte de traballo" + #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55 #: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82 @@ -709,16 +717,12 @@ msgstr "" msgid "End date" msgstr "Data de fin" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:245 -msgid "missing worker code in the work report" -msgstr "falta código de traballador nun parte de traballo" - #: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:89 msgid "profile name is already being used by another profile" msgstr "o nome do perfil xa está a ser usado por outro perfil" #: libreplan-webapp/src/main/webapp/settings/settings.zul:68 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:76 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:78 msgid "E-mail" msgstr "Correo electrónico" @@ -732,8 +736,8 @@ 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:593 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:594 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:327 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 @@ -781,7 +785,7 @@ msgstr "A versión do proxecto é a mesma nos escenarios de orixe e destino" msgid "Personal data" msgstr "Datos persoais" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:733 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:720 msgid "Calculated progress can not be removed" msgstr "O progreso calculado non se pode borrar" @@ -805,11 +809,11 @@ msgstr "{0} anotación obrigatoria en {1}" msgid "June" msgstr "Xuño" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1038 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1066 msgid "Modified" msgstr "Modificado" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:216 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:215 msgid "Add Criterion" msgstr "Engadir criterio" @@ -817,7 +821,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:653 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:680 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 " @@ -864,7 +868,7 @@ msgstr "Lista de tarefas subcontratadas" msgid "Average of worked hours in finished applications" msgstr "Media de horas traballadas nas aplicacións finalizadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:706 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:693 msgid "Calculated progress can not be modified" msgstr "O progreso calculado non se pode modificar" @@ -885,12 +889,12 @@ msgstr "Editar calendario" msgid "Profile" msgstr "Perfil" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:346 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:37 msgid "Materials Needs At Date" msgstr "Necesidades de materiais en data" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:277 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:279 msgid "UserDn" msgstr "UserDn" @@ -973,7 +977,7 @@ msgstr "Perderánse os cambios sen gardar. Gustaríalle continuar?" msgid "NON_LIMITING" msgstr "NON_LIMITANTE" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:291 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:297 msgid "Workers" msgstr "Traballadores" @@ -1014,14 +1018,14 @@ msgstr "nome do perfil non especificado" msgid "Date Start" msgstr "Data de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1275 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1261 msgid "Value is not valid, the current value must be less than max value" msgstr "O valor non é válido, o valor actual debe ser menor que o valor máximo" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 -#: libreplan-webapp/src/main/webapp/planner/order.zul:108 +#: libreplan-webapp/src/main/webapp/planner/order.zul:105 msgid "Value" msgstr "Valor" @@ -1034,7 +1038,7 @@ msgid "there are no valid periods for this calendar" msgstr "non hai períodos válidos para este calendario" #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:54 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:93 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:95 msgid "Add role" msgstr "Engadir rol" @@ -1044,8 +1048,8 @@ msgid "Exception end date should be greater or equals than start date" msgstr "" "A data de fin dunha excepción debe ser maior ou igual cá data de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:443 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:453 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:444 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:454 msgid "Repeated Project code {0} in Project {1}" msgstr "Código {0} de proxecto repetedio no proxecto {1}" @@ -1078,11 +1082,11 @@ msgid "Type data" msgstr "Datos do tipo" #: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:117 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:314 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 msgid "Profiles" msgstr "Perfís" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:256 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:258 msgid "Host" msgstr "Host" @@ -1144,7 +1148,7 @@ msgstr "Cambiar escenario" msgid "Critical path" msgstr "Camiño crítico" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:260 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:262 msgid "" "Deleting this item, it will disable the report progress option. Are you sure?" msgstr "" @@ -1186,11 +1190,11 @@ msgid "Cancel changes and back to scheduling" msgstr "Cancelar cambios e volver á planificación" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:386 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86 #: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:65 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68 -#: libreplan-webapp/src/main/webapp/planner/order.zul:109 +#: libreplan-webapp/src/main/webapp/planner/order.zul:106 msgid "Percentage" msgstr "Porcentaxe" @@ -1233,12 +1237,12 @@ msgstr "Tipo de excepción" msgid "Profiles List" msgstr "Listado de perfís" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:580 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:581 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:689 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:236 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:919 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:51 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:329 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:914 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:50 #: libreplan-webapp/src/main/webapp/templates/templates.zul:64 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:68 @@ -1249,12 +1253,12 @@ msgstr "Etiquetas" msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "{0} da categoría {1} e {2} da categoría {3} teñen o mesmo código" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 msgid "Data Types" msgstr "Tipos de datos" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:155 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:157 msgid "Total hours" msgstr "Total de horas" @@ -1319,13 +1323,13 @@ msgstr "xa asignado" #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:74 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:131 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:133 #: libreplan-webapp/src/main/webapp/common/configuration.zul:139 -#: libreplan-webapp/src/main/webapp/planner/order.zul:154 +#: libreplan-webapp/src/main/webapp/planner/order.zul:151 msgid "Calendar" msgstr "Calendario" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:301 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:307 #: libreplan-webapp/src/main/webapp/common/configuration.zul:119 msgid "Resources" msgstr "Recursos" @@ -1359,11 +1363,15 @@ msgstr "a" msgid "worker's first name not specified" msgstr "nome do traballador non especificado" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:337 +msgid "Property strategy" +msgstr "Stratexia de propiedade" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:281 msgid "date not specified" msgstr "data non especificada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:264 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:196 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:206 msgid "Projects Planning" @@ -1373,13 +1381,13 @@ msgstr "Planificación de proxectos" msgid "Shrink to fit page width" msgstr "Reducir para axustar ao ancho de páxina" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:773 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:760 msgid "The max value must be greater than 0" msgstr "O valor máximo debe ser maior que 0" #: libreplan-webapp/src/main/webapp/settings/settings.zul:63 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:70 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:55 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:56 msgid "Last name" msgstr "Apelidos" @@ -1404,12 +1412,12 @@ msgstr "SPI" msgid "Progress Type" msgstr "Tipo de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1295 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1304 msgid "Task contains consolidated progress. Cannot apply sigmoid function." msgstr "" "A tarefa contén progreso consolidado. Non se pode aplicar a función sigmoide." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:305 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:307 msgid "UserId" msgstr "UserId" @@ -1434,7 +1442,7 @@ msgstr "o código non pode ser nulo ou baleiro" msgid "Create New Project" msgstr "Crear proxecto novo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1430 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1439 msgid "Stretches list" msgstr "Lista de tramos" @@ -1446,7 +1454,7 @@ msgstr "Habilitar módulo de escenarios" msgid "Zoom" msgstr "Zoom" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:829 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:833 #: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:205 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:185 @@ -1465,16 +1473,16 @@ msgstr "Zoom" #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112 #: libreplan-webapp/src/main/webapp/materials/materials.zul:115 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:39 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:132 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:131 #: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:64 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:76 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:81 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:151 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 #: libreplan-webapp/src/main/webapp/templates/templates.zul:135 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:376 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:384 msgid "Save" msgstr "Gardar" @@ -1487,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:273 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:576 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:674 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:300 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:603 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:701 msgid "number of digits must be between {0} and {1}" msgstr "o número de díxitos debe estar entre {0} e {1}" @@ -1517,7 +1525,8 @@ msgstr "Problemas conectando co servizo web subcontratista" msgid "Entity type" msgstr "Tipo de entidade" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:263 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:271 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1023 msgid "Unsaved changes will be lost. Are you sure?" msgstr "Perderánse os cambios sen gardar. Está seguro?" @@ -1573,11 +1582,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:907 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:902 msgid "Name: {0}" msgstr "Nome: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:874 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:902 msgid "Move down" msgstr "Mover abaixo" @@ -1609,12 +1618,12 @@ msgstr "Datos xerais" msgid "BAC" msgstr "BAC" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:379 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:381 msgid "Calculate Number of Hours" msgstr "Calcular número de horas" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:105 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:104 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38 msgid "Assign" @@ -1624,7 +1633,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:1273 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1281 msgid "Create Template" msgstr "Crear modelo" @@ -1783,7 +1792,7 @@ msgstr "o nome non pode ser nulo ou baleiro" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:87 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 -#: libreplan-webapp/src/main/webapp/planner/order.zul:110 +#: libreplan-webapp/src/main/webapp/planner/order.zul:107 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:48 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 @@ -1800,7 +1809,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:651 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:678 msgid "" "format prefix invalid. It cannot be empty or contain '_' or whitespaces." msgstr "" @@ -1817,7 +1826,7 @@ msgstr "Filtrar por mes" msgid "The criterion and its type cannot be null" msgstr "O criterio e o seu tipo non poden ser nulos" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:421 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:422 msgid "The quality form must have an item with 100% value to report progress" msgstr "" "O formulario de calidaed debe ter un ítem con valor 100% para notificar " @@ -1831,6 +1840,10 @@ msgstr "Xullo" msgid "The code is not valid. There is another unit type with the same code" msgstr "O código non é válido. Hai outro tipo de unidade co mesmo código" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 +msgid "Enable LDAP authentication" +msgstr "Habilitar a autenticación LDAP" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:490 msgid "( max: {0} )" msgstr "( máx: {0} )" @@ -1851,6 +1864,7 @@ msgstr "Non se poden calcular gráficos para os datos actuais" msgid "Select queue" msgstr "Seleccionar cola" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1499 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:173 msgid "project name already being used" msgstr "o nome de proxecto xa está sendo usado" @@ -1859,7 +1873,7 @@ msgstr "o nome de proxecto xa está sendo usado" msgid "Work description" msgstr "Descrición do traballo" -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:63 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:61 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:59 msgid "Split assignment" msgstr "Dividir asignación" @@ -1883,7 +1897,7 @@ msgstr "Non se pode borrar o escenario por defecto, chamado \"{0}\"" msgid "direct link" msgstr "enlace directo" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:112 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:111 msgid "Down" msgstr "Abaixo" @@ -1897,12 +1911,12 @@ msgstr "Abaixo" msgid "Label" msgstr "Etiqueta" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:841 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:869 msgid "Value is not valid, taking into account the current list of HoursGroup" msgstr "O valor non é válido, tendo en conta a lista actual de HoursGroup" #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:51 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:90 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:92 msgid "Association with roles" msgstr "Asociación con roles" @@ -1914,8 +1928,8 @@ msgstr "falta tipo de horas de traballo nunha liña do parte" msgid "Quality forms" msgstr "Formularios de calidade" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:466 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:476 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:467 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:477 msgid "Repeated Hours Group code {0} in Project {1}" msgstr "Código {0} de groupo de horas repetido no proxecto {1}" @@ -1964,7 +1978,7 @@ msgstr "Pesimista" msgid "Limiting resource assignation" msgstr "Asignación de recursos limitantes" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1224 msgid "" "This progress can not be removed, because it is spread. It is necessary to " "select another progress as spread." @@ -2002,11 +2016,11 @@ msgstr "Retraso desde o comezo (en días)" msgid "Resource cannot be null" msgstr "O recurso non pode ser nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:453 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:455 msgid "Total Hours" msgstr "Horas totais" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:366 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:374 msgid "LibrePlan Role" msgstr "Rol LibrePlan" @@ -2018,28 +2032,32 @@ msgstr "Crear novo tipo de progreso" msgid "Confirm cancel" msgstr "Confirmar cancelación" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:37 msgid "Work And Progress Per Task" msgstr "Traballo e progreso por tarefa" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1523 +msgid "project code already being used" +msgstr "o código do proxecto xa está sendo usado" + #: libreplan-webapp/src/main/webapp/orders/_edition.zul:40 msgid "WBS (tasks)" msgstr "EDT (tarefas)" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1234 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:455 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:300 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:299 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:465 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:150 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:835 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:870 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:843 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:878 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:264 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:208 msgid "Error on showing removing element: " msgstr "Erro ao mostrar o elemento a borrar: " -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:701 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:728 msgid "Deleting sequence" msgstr "Borrando secuencia" @@ -2108,11 +2126,15 @@ msgstr "Histórico de asignacións" msgid "CutycaptTimeout thread exception" msgstr "Excepción no thread CutycaptTimeout" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:22 msgid "Work Report Models" msgstr "Modelos de partes de traballo" +#: libreplan-webapp/src/main/webapp/materials/materials.zul:73 +msgid "New" +msgstr "Novo" + #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:48 msgid "Date last progress measurement" msgstr "Data da última medida de progreso" @@ -2137,7 +2159,7 @@ msgstr "" "O calendario non se pudo borrar porque aínda ten fillos. Algún outro " "calendario deriva deste." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:907 msgid "Value is not valid, the type must be not empty" msgstr "O valor non é válido, o tipo non pode estar baleiro" @@ -2157,21 +2179,16 @@ msgstr "Non se pode borrar progreso consolidado." msgid "Create Task" msgstr "Crear tarefa" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 -msgid "LDAP Authentication enabled" -msgstr "Autenticación co LDAP activada" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27 msgid "External company" msgstr "Empresa externa" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:66 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:60 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:99 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:129 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:101 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:131 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:27 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 @@ -2191,7 +2208,7 @@ msgstr "Preferencias de usuario" msgid "Start hour" msgstr "Hora de inicio" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:140 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:139 msgid "Assign materials" msgstr "Asignar materiais" @@ -2210,7 +2227,7 @@ msgstr "o formato dos filtros non é válido" msgid "ID" msgstr "NIF" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:349 msgid "Settings" msgstr "Preferencias" @@ -2252,7 +2269,7 @@ msgstr "Grupo de horas" msgid "Unallocated name" msgstr "Nome no asignado" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:895 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:923 msgid "Move up" msgstr "Mover arriba" @@ -2265,14 +2282,14 @@ msgid "Subcontract communication date" msgstr "Data de comunicación da subcontratación" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:281 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:263 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:359 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:269 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:365 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:131 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:134 msgid "Scheduling" msgstr "Planificación" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:126 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:128 msgid "Dependencies have priority" msgstr "As dependencias teñen prioridade" @@ -2304,9 +2321,9 @@ msgstr "Páxina arriba" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:915 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:910 #: libreplan-webapp/src/main/webapp/orders/_list.zul:35 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:159 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:161 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53 msgid "State" @@ -2316,11 +2333,11 @@ msgstr "Estado" msgid "Must start after" msgstr "Debe empezar despois" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1306 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1315 msgid "Confirm change" msgstr "Confirmar cambio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:840 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:848 msgid "You don't have permissions to edit this project" msgstr "Non ten permisos para editar este proxecto" @@ -2361,7 +2378,7 @@ msgstr "LibrePlan: Materiais" msgid "New task" msgstr "Nova tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:192 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:191 msgid "The password for a new user cannot be empty" msgstr "O contrasinal non pode ser baleiro para un usuario novo" @@ -2451,7 +2468,7 @@ msgid "Value is not valid, the default max value must not be empty " msgstr "" "O valor non é válido, o valor máximo por defecto non debe estar baleiro " -#: libreplan-webapp/src/main/webapp/common/configuration.zul:343 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:349 msgid "Role property" msgstr "Propiedade do rol" @@ -2476,15 +2493,15 @@ msgstr "Asignación recomendada" msgid "Activation" msgstr "Activación" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310 msgid "Scenarios" msgstr "Escenarios" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:376 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:375 msgid "Materials saved" msgstr "Materiais gardados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1252 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238 msgid "" "This progress measurement can not be in current date, because it is " "consolidated. it is necessary to select other date." @@ -2492,7 +2509,7 @@ msgstr "" "Esta medida de progreso non pode estar na data actual, porque está " "consolidada. Débese seleccionar outra data." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:334 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:37 msgid "Total Worked Hours By Resource In A Month" msgstr "Total horas traballadas por recurso nun mes" @@ -2509,7 +2526,7 @@ msgstr "Buffer de tarefas de entrada" msgid "At least one {0} sequence must be active" msgstr "Polo menos unha secuencia de {0} debe estar activa" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:130 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:26 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 @@ -2532,7 +2549,7 @@ msgstr "Debe seleccionar un escenario de orixe" msgid "At least one {0} sequence is needed" msgstr "Necesítase polo menos unha secuencia de {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:37 msgid "Estimated/Planned Hours Per Task" msgstr "Horas estimadas/planificadas por tarefa" @@ -2545,7 +2562,11 @@ msgstr "LibrePlan: Categorías de custo" msgid "Assigned" msgstr "Asignado" -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:45 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:244 +msgid "Use LDAP roles" +msgstr "Utilizar roles do LDAP" + +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:44 msgid "Details" msgstr "Detalles" @@ -2582,7 +2603,7 @@ msgstr "Data máis cedo" msgid "LibrePlan: Work And Progress Per Task" msgstr "LibrePlan: Traballo e progreso por tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:350 msgid "Change Password" msgstr "Cambiar o contrasinal" @@ -2590,14 +2611,15 @@ msgstr "Cambiar o contrasinal" msgid "Projects" msgstr "Proxectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:264 -msgid "Confirm exit dialog" -msgstr "Diálogo para confirmar a salida" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/converters/ConverterFactory.java:64 msgid "Not found converter for {0}" msgstr "Non se atopou un conversor para {0}" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:272 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1024 +msgid "Confirm exit dialog" +msgstr "Diálogo para confirmar a salida" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:70 msgid "Material assignments" msgstr "Asignacións de materiais" @@ -2626,7 +2648,7 @@ msgstr "" msgid "Question" msgstr "Pregunta" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1249 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1235 msgid "" "This progress measurement can not be changed or removed, because it is " "consolidated. It is needed to remove its consolidation." @@ -2685,7 +2707,7 @@ msgstr "Rexistro de traballo" msgid "Output format" msgstr "Formato de saída" -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:44 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:47 msgid "Print" msgstr "Imprimir" @@ -2720,25 +2742,24 @@ msgstr "O esforzo non pode ser nulo" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:41 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:138 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:137 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:70 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:80 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:85 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:157 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:88 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:142 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:141 #: libreplan-webapp/src/main/webapp/templates/templates.zul:139 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:100 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:379 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:387 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:50 -#: libreplan-webapp/src/main/webapp/planner/order.zul:73 -#: libreplan-webapp/src/main/webapp/planner/order.zul:134 -#: libreplan-webapp/src/main/webapp/planner/order.zul:169 +#: libreplan-webapp/src/main/webapp/planner/order.zul:131 +#: libreplan-webapp/src/main/webapp/planner/order.zul:166 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:91 #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42 -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:48 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:81 msgid "Cancel" msgstr "Cancelar" @@ -2767,8 +2788,8 @@ msgstr "Lista de máquinas" msgid "CPI" msgstr "CPI" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:687 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:695 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:907 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:318 msgid "You don't have read access to this project" msgstr "Non ten acceso de lectura a este proxecto" @@ -2836,11 +2857,11 @@ msgstr "nome" msgid "Delete selected task" msgstr "Borrar tarefa seleccionada" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java:130 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java:126 msgid "{0} (max: {1})" msgstr "{0} (máx: {1})" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:470 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:471 msgid "end" msgstr "fin" @@ -2848,7 +2869,7 @@ msgstr "fin" msgid "Cost Category" msgstr "Categoría de custo" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:350 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:357 msgid "Role search query" msgstr "Consulta para a búsqueda de roles" @@ -2874,7 +2895,7 @@ msgstr "Editar tarefa: {0}" msgid "Start date cannot be null" msgstr "A data de inicio non pode ser nula" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304 msgid "Subcontracting" msgstr "Subcontratación" @@ -2882,7 +2903,7 @@ msgstr "Subcontratación" msgid "references" msgstr "referencias" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1278 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1264 msgid "Value is not valid, the Precision value must be exact " msgstr "O valor non é válido, o valor de precisión debe ser exacto " @@ -2902,7 +2923,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:855 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:863 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 " @@ -2944,7 +2965,7 @@ msgstr "LibrePlan: Cambiar o contrasinal" msgid "please, select a label" msgstr "por favor, seleccione unha etiqueta" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:123 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:125 msgid "Add profile" msgstr "Engadir perfil" @@ -2966,7 +2987,7 @@ msgstr "falta código nos datos de versión dun calendario" msgid "Criterion name" msgstr "Nome do criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:131 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:127 msgid "values are not valid, the values must not be null" msgstr "os valores non son válidos, non deben ser nulos" @@ -2984,7 +3005,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:127 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:132 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:132 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 @@ -3018,7 +3039,7 @@ msgid "the name must be not empty" msgstr "o nome non pode ser baleiro" #: libreplan-webapp/src/main/webapp/materials/materials.zul:85 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:71 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:72 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:27 msgid "Disabled" msgstr "Deshabilitado" @@ -3057,8 +3078,8 @@ msgstr "" "tentando crear un modelo a partir dunha tarefa nova.\n" "Por favor garde o seu proxecto antes de continuar." -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1114 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1129 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1109 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1124 msgid "{0} not supported yet" msgstr "{0} aínda non soportado" @@ -3079,7 +3100,7 @@ msgstr "Algunhas secuencias para borrar non existen" msgid "Resources Load" msgstr "Carga de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:214 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:241 msgid "Changes have been canceled" msgstr "Cambios cancelados" @@ -3087,7 +3108,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:297 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:299 msgid "Authentication" msgstr "Autenticación" @@ -3149,7 +3170,7 @@ msgstr "Propagación" msgid "Select start date" msgstr "Seleccionar data de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:877 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:885 msgid "Removed {0}" msgstr "{0} borrado" @@ -3168,7 +3189,7 @@ msgid "Group name" msgstr "Nome do grupo" #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:59 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:98 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:100 msgid "Role name" msgstr "Nome do rol" @@ -3210,11 +3231,11 @@ msgstr "Engadir fito" msgid "Assign selected items" msgstr "Asignar elementos seleccionados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:449 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:450 msgid "init" msgstr "inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1215 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1201 msgid "Add new progress measurement" msgstr "Engadir nova medida de progreso" @@ -3222,7 +3243,7 @@ msgstr "Engadir nova medida de progreso" msgid "Select for automatic queuing" msgstr "Seleccione para encolar automáticamente" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 msgid "Scenarios Management" msgstr "Administración de escenarios" @@ -3234,7 +3255,7 @@ msgstr "Proxecto {0} transferido" msgid "Create & Assign" msgstr "Crear e asignar" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1549 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1558 msgid "Not configurable" msgstr "Non configurable" @@ -3242,7 +3263,7 @@ msgstr "Non configurable" msgid "Advanced allocation" msgstr "Asignación avanzada" -#: libreplan-webapp/src/main/webapp/planner/order.zul:111 +#: libreplan-webapp/src/main/webapp/planner/order.zul:108 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:93 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:96 msgid "Consolidated" @@ -3277,7 +3298,7 @@ msgstr "LibrePlan: Acceso de usuarios" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:67 #: libreplan-webapp/src/main/webapp/orders/_list.zul:32 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:109 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:111 msgid "Customer" msgstr "Cliente" @@ -3292,17 +3313,19 @@ msgstr "Tipo de horas" msgid "criterion type name not specified" msgstr "nome do tipo de criterio non especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:246 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:273 msgid "Cannot connect to LDAP server" msgstr "Non se pode conectar ao servidor de LDAP" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:220 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:219 msgid "Add Exception" msgstr "Engadir excepción" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:301 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:322 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:346 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:303 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:324 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:348 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:378 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:219 msgid "cannot be empty" msgstr "non pode ser baleiro" @@ -3387,8 +3410,8 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:441 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:443 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:930 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:94 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 @@ -3416,7 +3439,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77 #: libreplan-webapp/src/main/webapp/materials/materials.zul:58 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:42 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:84 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66 @@ -3430,7 +3453,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:51 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:40 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:35 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 #: libreplan-webapp/src/main/webapp/orders/_list.zul:28 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:72 #: libreplan-webapp/src/main/webapp/templates/templates.zul:80 @@ -3481,11 +3504,11 @@ msgstr "Día da semana" msgid "Companies List" msgstr "Lista de empresas" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1453 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1462 msgid "Stretches with Interpolation" msgstr "Tramos con interpolación" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:333 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:37 msgid "Hours Worked Per Resource" msgstr "Horas traballadas por recurso" @@ -3575,22 +3598,22 @@ 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:198 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:225 msgid "Changes saved" msgstr "Cambios gardados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1258 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1266 msgid "See scheduling" msgstr "Ver planificación" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:341 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:328 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:331 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:107 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110 msgid "Progress measurements" msgstr "Medidas de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1214 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1200 msgid "Add measure" msgstr "Engadir medida" @@ -3619,7 +3642,7 @@ msgstr "Relación" msgid "End" msgstr "Fin" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1360 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1346 msgid "The date is not valid, the date must be not empty" msgstr "A data non é válida, non debe ser baleira" @@ -3628,7 +3651,7 @@ msgid "User login name" msgstr "Nome de usuario" #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:534 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 msgid "Cost Categories" msgstr "Categorías de custo" @@ -3654,7 +3677,7 @@ msgstr "Lista de usuarios" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:27 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:55 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:57 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:56 msgid "Task quality forms" msgstr "Formularios de calidade de tarefa" @@ -3671,7 +3694,7 @@ msgstr "Tipos de progreso" msgid "Cost category" msgstr "Categoría de custo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:700 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:727 msgid "It can not be deleted. At least one sequence is necessary." msgstr "Non se pode borrar. Polo menos unha secuencia é necesaria." @@ -3721,26 +3744,26 @@ msgstr "Engadir novo campo de tipo de etiqueta" msgid "Time finish cannot be null" msgstr "A hora de fin non pode ser nula" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:116 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:118 msgid "Customer reference" msgstr "Referencia del cliente" #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:688 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:841 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:891 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:900 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:927 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:696 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:849 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:908 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:935 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:146 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:319 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:360 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:309 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:319 msgid "Information" msgstr "Información" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:926 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:934 msgid "Sorry, you do not have permissions to access this project" msgstr "Sentímolo, non ten permisos para acceder a este proxecto" @@ -3760,6 +3783,10 @@ msgstr "non se pode pasar mentres o elemento anterior non sexa pasado." msgid "New hours group " msgstr "novo grupo de horas " +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45 +msgid "Please remember that only saved changes will be printed" +msgstr "Por favor lembra que só os cambios gardados serán impresos" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:464 msgid "Assign element to queue manually" msgstr "Asignar elemento á cola manualmente" @@ -3772,11 +3799,11 @@ msgstr "Editar modelo" msgid "Resource: {0} " msgstr "Recurso: {0} " -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:358 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:360 msgid "percentage cannot be duplicated" msgstr "a porcentaxe non pode estar duplicada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 msgid "Work Hours" msgstr "Horas de traballo" @@ -3830,8 +3857,8 @@ msgstr "Asignacións de traballador" #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:154 #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:182 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java:173 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:305 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:307 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:328 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:221 msgid "{0} already exists" msgstr "{0} xa existe" @@ -3849,20 +3876,20 @@ msgid "Code " msgstr "Código" #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:66 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:65 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:66 msgid "Password confirmation" msgstr "Confirmación de contrasinal" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:88 -msgid "Work Report" -msgstr "Parte de traballo" - #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:71 msgid "Indent selected task" msgstr "Indentar tarefa seleccionada" +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:88 +msgid "Work Report" +msgstr "Parte de traballo" + #: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:189 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:330 #: libreplan-webapp/src/main/webapp/common/configuration.zul:135 msgid "Unit Measures" msgstr "Unidades de medida" @@ -3872,11 +3899,11 @@ msgstr "Unidades de medida" msgid "Show progress" msgstr "Mostrar progreso" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:142 msgid "Work" msgstr "Traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:297 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:298 msgid "" "Error saving the project\n" "{0}" @@ -3898,9 +3925,9 @@ msgstr "LibrePlan: Máquinas" #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:630 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:298 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:299 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:121 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1296 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305 msgid "Error" msgstr "Erro" @@ -3941,7 +3968,7 @@ msgstr "" "criterionType" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationCommand.java:67 -#: libreplan-webapp/src/main/webapp/planner/order.zul:83 +#: libreplan-webapp/src/main/webapp/planner/order.zul:80 msgid "Progress consolidation" msgstr "Consolidación de progreso" @@ -3970,7 +3997,7 @@ msgstr "Recursos limitantes" msgid "Task Information" msgstr "Información da tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:140 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:145 msgid "Hours Group at " msgstr "Grupo de horas en " @@ -3993,7 +4020,7 @@ msgstr "un día está baleiro" msgid "Budgeted Cost Work Scheduled" msgstr "Custo de traballo presupostado planificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 msgid "Changes applied" msgstr "Cambios aplicados" @@ -4025,7 +4052,7 @@ msgstr "Desviación en custo" msgid "criterion type does not allow resource hierarchy" msgstr "o tipo de criterio non permite xerarquía de recursos" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:150 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:152 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:95 msgid "Total" @@ -4048,8 +4075,8 @@ msgstr "Editar tarefa: {0}" msgid "Select destination" msgstr "Seleccionar destino" -#: libreplan-webapp/src/main/webapp/planner/order.zul:92 -#: libreplan-webapp/src/main/webapp/planner/order.zul:98 +#: libreplan-webapp/src/main/webapp/planner/order.zul:89 +#: libreplan-webapp/src/main/webapp/planner/order.zul:95 msgid "Check consolidated progresses" msgstr "Marcar progresos consolidados" @@ -4077,7 +4104,7 @@ msgid "Apply tab changes" msgstr "Aplicar cambios da pestana" #: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:93 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:171 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:170 msgid "passwords don't match" msgstr "os contrasinais non coinciden" @@ -4105,7 +4132,7 @@ msgstr "novo fito" msgid "Value last progress reported" msgstr "Valor último progreso notificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306 msgid "Report Progress" msgstr "Notificar progreso" @@ -4113,7 +4140,7 @@ msgstr "Notificar progreso" msgid "Show dependencies" msgstr "Mostrar dependencias" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:347 msgid "Schedule from start to deadline" msgstr "Planificar dende o principio á data límite" @@ -4149,7 +4176,7 @@ msgstr "LibrePlan: Días de excepción" msgid "LibrePlan: Work Hours" msgstr "LibrePlan: Horas de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 msgid "LibrePlan Configuration" msgstr "LibrePlan: Configuración" @@ -4199,7 +4226,7 @@ msgstr "Tipo de excepción" msgid "In the available periods {0} only {1} hours are available." msgstr "Nos períodos dispoñibles {0} só hai dispoñibles {1} horas." -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:118 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:120 msgid "Association with profiles" msgstr "Asociación con perfís" @@ -4233,11 +4260,11 @@ msgstr "Preferencias da aplicación" msgid "Average of estimated hours" msgstr "Media de horas estimadas" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:270 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:272 msgid "Base" msgstr "Base" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:682 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:683 msgid "" "You can not remove the task \"{0}\" because of this or any of its children " "are already in use in some work reports" @@ -4257,7 +4284,7 @@ msgstr "Seleccionar orixe" msgid "Worker deleted" msgstr "Traballador borrado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:733 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:760 msgid "Select entity, please" msgstr "Seleccionar entidade, por favor" @@ -4348,7 +4375,7 @@ msgstr "O nome do campo debe ser único, non nulo e non baleiro" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:382 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:136 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:157 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:84 msgid "Position" msgstr "Posición" @@ -4374,7 +4401,7 @@ msgstr "Recursos limitantes (proxecto)" msgid "A description field of the same name already exists." msgstr "Xa existe un campo de descrición co mesmo nome." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1177 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1163 msgid "" "Progress measurements that are reported by quality forms can not be removed" msgstr "" @@ -4421,7 +4448,7 @@ 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:248 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:250 msgid "Configuration" msgstr "Configuración" @@ -4443,11 +4470,11 @@ msgid "Select type" msgstr "Seleccione tipo" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:678 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:911 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:906 msgid "Hours invested" msgstr "Horas invertidas" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:324 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:326 msgid "Authorization" msgstr "Autorización" @@ -4456,7 +4483,7 @@ msgid "" "The name is not valid, there is another progress type with the same name. " msgstr "O nome non é válido, xa hai outro tipo de progreso co mesmo nome. " -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:319 msgid "Project saved" msgstr "Proxecto gardado" @@ -4476,7 +4503,7 @@ msgstr "recurso do criterio satisfeito non especificado" msgid "Derived exception" msgstr "Excepción derivada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:292 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298 msgid "Machines" msgstr "Máquinas" @@ -4484,7 +4511,7 @@ msgstr "Máquinas" msgid "Unit Measures List" msgstr "Lista de unidades de medida" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:153 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:149 msgid "Couldn't find element: {0}" msgstr "Non se puido atopar o elemento: {0}" @@ -4497,7 +4524,7 @@ msgstr "Debe seleccionar un escenario de destino" msgid "unit type code not found" msgstr "código de tipo de unidade non atopado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:348 msgid "My account" msgstr "A miña conta" @@ -4513,7 +4540,7 @@ msgstr "Vista da compañía" msgid "Both" msgstr "Ambos" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:758 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:764 msgid "Not editable for containing more that an hours group." msgstr "Non editable por conter máis dun grupo de horas." @@ -4527,7 +4554,7 @@ msgid "Limiting resource" msgstr "Recurso limitante" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/calendar/CalendarAllocationCommand.java:58 -#: libreplan-webapp/src/main/webapp/planner/order.zul:146 +#: libreplan-webapp/src/main/webapp/planner/order.zul:143 msgid "Calendar allocation" msgstr "Asignación de calendario" @@ -4543,7 +4570,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/materials/materials.zul:84 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:32 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:120 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:119 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33 msgid "Category" msgstr "Categoría" @@ -4561,7 +4588,7 @@ msgstr "[xenérico todos os traballadores]" msgid "Category data" msgstr "Datos de categoría" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:103 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:102 msgid "Search" msgstr "Buscar" @@ -4602,11 +4629,11 @@ msgstr "Borrar calendario" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1700 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:425 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:651 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1323 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:669 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1331 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:670 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:254 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:337 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:259 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:251 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:141 msgid "must be lower than finish date" msgstr "debe ser anterior á data de fin" @@ -4636,7 +4663,7 @@ msgstr "Data último progreso notificado" msgid "Could not load any resource" msgstr "Non se puido cargar un recurso" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:335 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:341 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:37 msgid "Work And Progress Per Project" msgstr "Traballo e progreso por proxecto" @@ -4701,8 +4728,8 @@ msgstr "Datos da empresa" msgid "Unit type code cannot be empty" msgstr "O código de tipo de unidade non pode ser baleiro" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:184 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:183 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318 msgid "Users" msgstr "Usuarios" @@ -4817,11 +4844,11 @@ msgstr "Filtrar por traballadores" msgid "Load due to current project" msgstr "Carga debido ao proxecto actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1314 msgid "You are going to change the assignment function. Are you sure?" msgstr "Vai cambiar a función de asignación. ¿Está seguro?" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:328 msgid "Exception Days" msgstr "Días de excepción" @@ -4842,13 +4869,13 @@ msgstr "Actualización incompatible: i recurso almacenado non é de tipo: {0}" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:114 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:40 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:135 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:134 #: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:67 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:78 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:83 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 #: libreplan-webapp/src/main/webapp/templates/templates.zul:137 msgid "Save & Continue" msgstr "Gardar e continuar" @@ -4857,7 +4884,7 @@ msgstr "Gardar e continuar" msgid "LibrePlan: Work And Progress Per Project" msgstr "LibrePlan: Traballo e progreso por proxecto" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:90 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:92 msgid "Scheduling mode" msgstr "Modo de planificación" @@ -4897,11 +4924,16 @@ msgstr "ACWP" msgid "The periods available depend on the resource's calendar." msgstr "Os períodos dispoñibles dependen do calendario do recurso." +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:83 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 +msgid "Authentication type" +msgstr "Tipo de autenticación" + #: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:55 msgid "START" msgstr "INICIO" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:342 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:350 msgid "Schedule from the deadline to start" msgstr "Planificar dende a data límite ao principio" @@ -4913,8 +4945,9 @@ msgstr "asignación xenérica de máquinas" msgid "Non limiting resource assignation" msgstr "Asignación de recursos non limitantes" -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:87 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:86 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75 +#: libreplan-webapp/src/main/webapp/planner/order.zul:70 #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68 msgid "Back" msgstr "Atrás" @@ -4933,11 +4966,11 @@ msgstr "Administración" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1682 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:634 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1306 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:651 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1314 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:652 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:237 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:318 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:242 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:234 msgid "must be greater than start date" msgstr "debe ser maior que a data de inicio" @@ -4962,7 +4995,7 @@ msgstr "horas traballadas" msgid "Unit measure name" msgstr "Nome da unidade de medida" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:144 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:140 msgid "cannot include a progress of the same progress type twice" msgstr "non se pode asignar un progreso do mesmo tipo dúas veces" @@ -5019,7 +5052,7 @@ msgstr "Total de horas de tarefa" msgid "Removed calendar \"{0}\"" msgstr "Borrado calendario \"{0}\"" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1063 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1071 msgid "Create project" msgstr "Crear proxecto" @@ -5033,7 +5066,7 @@ msgid "" msgstr "" "Permitir múltiples valores deste tipo de criterio no mesmo período de tempo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1294 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1280 msgid "" "The date is not valid, the date must be unique for this progress assignment" msgstr "A data non é válida, debe ser única para esta asignación de progreso" @@ -5070,11 +5103,11 @@ msgstr "si" msgid "Root calendar" msgstr "Calendario raíz" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:263 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:265 msgid "Port" msgstr "Porto" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:862 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:870 msgid "" "Deleting this subcontracted project, you are going to lose the relation to " "report progress. Are you sure?" @@ -5113,7 +5146,7 @@ msgstr "Asignación de categoría de custo" msgid "missing code in a hour cost" msgstr "falta código nun custo por hora" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:870 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:858 msgid "All workers" msgstr "Todos os traballadores" @@ -5134,12 +5167,14 @@ msgstr "Seleccione conxunto de criterios requeridos e pulse o botón de filtrar" #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:121 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:123 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:311 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:207 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:307 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1492 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1516 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:115 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:168 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:738 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:765 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:134 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:58 @@ -5168,7 +5203,6 @@ msgstr "Seleccione conxunto de criterios requeridos e pulse o botón de filtrar" #: libreplan-webapp/src/main/webapp/users/_editUser.zul:46 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:37 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:45 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:39 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96 msgid "cannot be null or empty" @@ -5187,7 +5221,7 @@ msgstr "Novo código" msgid "The progress type cannot be modified" msgstr "O tipo de progreso non pode ser modificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:392 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:394 msgid "Calculate Resources per Day" msgstr "Calcular recursos por día" @@ -5201,7 +5235,7 @@ msgstr "Estimación do custo pendente" #: libreplan-webapp/src/main/webapp/materials/materials.zul:83 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:29 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 msgid "Unit type" msgstr "Tipo de unidade" @@ -5222,7 +5256,7 @@ msgstr "Esta máquina xa foi borrada por outro usuario" msgid "Calendar data" msgstr "Datos do calendario" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:294 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300 msgid "Work Reports" msgstr "Partes de traballo" @@ -5261,8 +5295,8 @@ msgstr "Xa existe outra etiqueta co mesmo nome" msgid "Customer Reference" msgstr "Referencia do cliente" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:134 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:147 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:130 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:143 msgid "spread values are not valid, at least one value should be true" msgstr "" "os valores de propagación non son válidos, alo menos un debe ser verdadeiro" @@ -5295,12 +5329,12 @@ msgstr "" "O calendario por defecto non se pode borrar. Por favor, cambie antes o " "calendario por defecto na ventá de configuración." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:600 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:601 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:677 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:908 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:903 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:46 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:49 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:48 #: libreplan-webapp/src/main/webapp/templates/templates.zul:63 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 msgid "Progress" @@ -5314,7 +5348,7 @@ msgstr "" "Este tipo de criterio non se pode borrar porque ten asignacións a proxectos " "ou recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1224 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1210 msgid "All progress types have already been assigned." msgstr "Xa se asignaron todos os tipos de progreso." @@ -5326,7 +5360,7 @@ msgstr "Prezo por hora" msgid "Project: {0} " msgstr "Proxecto: {0} " -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:315 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 msgid "Calendars" msgstr "Calendarios" @@ -5365,7 +5399,7 @@ msgstr "LibrePlan: Partes de traballo" msgid "Error on showing delete confirm" msgstr "Erro ao mostrar a confirmación de borrado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:623 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:625 msgid "Sum of all rows" msgstr "Suma de todas as filas" @@ -5416,7 +5450,7 @@ msgstr "Nome da unidade de configuración de cada traballador" msgid "Active" msgstr "Activo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1261 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1247 msgid "This progress measurement can not be in " msgstr "Esta medida de progreso non pode estar en " @@ -5424,7 +5458,7 @@ msgstr "Esta medida de progreso non pode estar en " msgid "Inherited labels" msgstr "Etiquetas herdadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1246 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1232 msgid "" "This progress can not be changed or removed, because it has got consolidated " "progress. It is needed to remove the consolidation on all its progress." @@ -5434,12 +5468,12 @@ msgstr "" "progreso." #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:917 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:945 msgid "Unindent" msgstr "Desindentar" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:935 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1384 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1370 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" @@ -5467,7 +5501,7 @@ msgstr "Precisión" msgid "missing code in a work report line" msgstr "falta código nunha liña de parte de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:928 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:937 msgid "Efforts" msgstr "Esforzos" @@ -5475,7 +5509,7 @@ msgstr "Esforzos" msgid "Show all reported hours" msgstr "Mostrar todas as horas notificadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:102 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:113 msgid "Projects List" @@ -5494,7 +5528,7 @@ msgstr "Listado de proxectos" #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:46 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:46 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:80 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:82 msgid "Generate code" msgstr "Xerar código" @@ -5506,14 +5540,10 @@ msgstr "Estado de planificación" msgid "This template can not be removed because it has applications." msgstr "Este modelo non pode borrarse porque ten aplicacións." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:486 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:513 msgid "The code sequence is already in use and it can not be updated." msgstr "O código da secuencia xa está en uso e non se pode actualizar." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:332 -msgid "Import LDAP roles" -msgstr "Importar roles do LDAP" - #: libreplan-webapp/src/main/webapp/settings/settings.zul:43 msgid "Personal Data" msgstr "Datos persoais" @@ -5530,7 +5560,7 @@ msgstr "LibrePlan: Horas traballadas por recurso" msgid "Number of iterations should be between 1 and " msgstr "O número de iteracións debe estar entre 1 e " -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:142 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:149 msgid "Scenarios must be enabled as more elements than master exist" msgstr "" "Os escenarios deben estar habilitados xa que existen máis elementos que " @@ -5550,7 +5580,7 @@ msgstr "Tarefa {0} : O grupo de tarefas ten un tipo incompatible con {1}" msgid "Profiles authorization" msgstr "Autorización de perfís" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:293 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 msgid "Virtual Workers Groups" msgstr "Grupos de traballadores virtuais" @@ -5614,9 +5644,9 @@ msgid "All projects" msgstr "Todos os proxectos" #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:41 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:60 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:61 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:83 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:284 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:286 msgid "Password" msgstr "Contrasinal" @@ -5625,7 +5655,7 @@ msgstr "Contrasinal" msgid "Observations" msgstr "Observacións" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:942 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:950 msgid "Edit project" msgstr "Editar proxecto" @@ -5664,7 +5694,7 @@ msgstr "Cor" msgid "Current password is incorrect" msgstr "O contrasinal actual é incorrecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:367 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:366 msgid "Cannot insert material in general view. Please, select a category" msgstr "" "Non se pode insertar material na vista xeral. Por favor, seleccione unha " @@ -5687,9 +5717,8 @@ msgstr "Borrar {0} \"{1}\". ¿Está seguro?" #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:86 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:98 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:48 -#: libreplan-webapp/src/main/webapp/planner/order.zul:70 -#: libreplan-webapp/src/main/webapp/planner/order.zul:131 -#: libreplan-webapp/src/main/webapp/planner/order.zul:166 +#: libreplan-webapp/src/main/webapp/planner/order.zul:128 +#: libreplan-webapp/src/main/webapp/planner/order.zul:163 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:89 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:79 #: libreplan-webapp/src/main/webapp/planner/main.zul:66 @@ -5697,14 +5726,14 @@ msgid "Accept" msgstr "Aceptar" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:81 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:259 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:266 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:273 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:280 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:308 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:339 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:346 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:261 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:268 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:275 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:282 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:310 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:345 #: libreplan-webapp/src/main/webapp/common/configuration.zul:353 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:361 msgid "Example: {0}" msgstr "Exemplo: {0}" @@ -5728,7 +5757,7 @@ msgstr "Calculado" msgid "Completed: {0}% " msgstr "Completado: {0}% " -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1181 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1167 msgid "Calculated progress measurement can not be removed" msgstr "As medidas de progreso calculadas non se poden borrar" @@ -5831,9 +5860,9 @@ msgstr "" #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:41 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:26 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:115 #: libreplan-webapp/src/main/webapp/orders/_list.zul:29 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:76 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:77 #: libreplan-webapp/src/main/webapp/templates/templates.zul:85 #: libreplan-webapp/src/main/webapp/templates/_list.zul:26 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 @@ -5856,7 +5885,7 @@ msgstr "Mostrar asignacións de recursos" msgid "Assignation type" msgstr "Tipo de asignación" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:367 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:369 msgid "Calculate Workable Days" msgstr "Calcular días laborais" @@ -5886,7 +5915,7 @@ msgstr "Actualizar excepción" msgid "Operation cannot be done" msgstr "Non se pode realizar a operación" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:138 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 msgid "Budget" msgstr "Presuposto" @@ -5983,7 +6012,7 @@ msgstr "Carga" #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:43 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:59 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:120 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:122 #: libreplan-webapp/src/main/webapp/templates/templates.zul:101 #: libreplan-webapp/src/main/webapp/templates/_list.zul:32 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 @@ -6004,11 +6033,11 @@ msgid "already exists an allocation for criteria {0}" msgstr "xa existe unha asignación para os criterios {0}" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:283 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:294 msgid "Project Templates" msgstr "Modelos de proxectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:347 msgid "Forward" msgstr "Adiante" @@ -6026,7 +6055,7 @@ msgstr "Número de aplicacións finalizadas" msgid "Unnasigned" msgstr "Non asignado" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:179 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:178 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:74 #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:165 @@ -6053,7 +6082,7 @@ msgstr "A porcentaxe de duración debería estar entre 0 e 100" msgid "Multiple values per resource" msgstr "Múltiples valores por recurso" -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:62 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:60 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58 msgid "Split" msgstr "Dividir" @@ -6076,7 +6105,7 @@ msgstr "Compatible cos navegadores Chrome, Firefox, Safari e Epiphany" #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:45 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:56 #: libreplan-webapp/src/main/webapp/orders/_list.zul:30 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:94 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:96 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:51 msgid "Starting date" msgstr "Data de inicio" @@ -6089,7 +6118,7 @@ msgstr "Engadir materiais" msgid "Load 100%" msgstr "Carga 100%" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:934 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:943 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:84 msgid "Function" msgstr "Función" @@ -6099,7 +6128,7 @@ msgstr "Función" msgid "date in future" msgstr "data no futuro" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:851 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:855 msgid "New project version" msgstr "Nova versión de proxecto" @@ -6116,8 +6145,8 @@ msgstr "Formato" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:364 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1226 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:483 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1234 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:484 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:77 #: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:537 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:78 @@ -6147,7 +6176,7 @@ msgstr "Editar" msgid "Init date" msgstr "Data de inicio" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:104 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:106 msgid "Responsible" msgstr "Responsable" @@ -6155,7 +6184,7 @@ msgstr "Responsable" msgid "New password" msgstr "Novo contrasinal" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:352 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:354 msgid "percentage must be in range (0,100]" msgstr "a porcentaxe debe estar no rango (0,100]" @@ -6195,7 +6224,7 @@ msgstr "Árobre {0} aplanada satisfatoriamente" #: libreplan-webapp/src/main/webapp/materials/materials.zul:82 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:30 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:119 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 msgid "Unit price" msgstr "Prezo da unidade" @@ -6283,8 +6312,8 @@ msgstr "Novembro" msgid "Enable/Disable" msgstr "Habilitar/Deshabilitar" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1282 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1304 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1268 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1290 msgid "" "Value is not valid, the value must be greater than the value of the previous " "progress." @@ -6326,7 +6355,7 @@ msgstr "Criterio" msgid "unl" msgstr "ili" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:290 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:292 msgid "Test LDAP connection" msgstr "Probar a conexión co LDAP" @@ -6344,11 +6373,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:172 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:177 msgid "Create project from Template" msgstr "Crear proxecto a partir de modelo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:417 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:418 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" @@ -6366,7 +6395,7 @@ msgstr "Debe seleccionar un tipo de autorización" msgid "Must start after (days since beginning project)" msgstr "Debe empezar despois de (días desde o inicio do proxecto)" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:850 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:854 msgid "" "Confirm creating a new project version for this scenario and derived. Are " "you sure?" @@ -6379,7 +6408,6 @@ msgstr "" #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:72 #: libreplan-webapp/src/main/webapp/materials/materials.zul:45 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:73 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:59 @@ -6421,7 +6449,7 @@ msgstr "Debe seleccionar o tipo de excepción" #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:62 #: libreplan-webapp/src/main/webapp/orders/_list.zul:31 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:99 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:101 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46 msgid "Deadline" msgstr "data límite" @@ -6430,7 +6458,7 @@ msgstr "data límite" msgid "Tasks" msgstr "Tarefas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 msgid "Subcontracted Tasks" msgstr "Tarefas subcontratadas" @@ -6461,7 +6489,7 @@ msgstr "Tipo de etiqueta" msgid "Advanced Allocation" msgstr "Asignación avanzada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 msgid "Administration / Management" msgstr "Administración / Xestión" @@ -6473,7 +6501,7 @@ msgstr "Número de iteracións" msgid "Template Tree" msgstr "Árbore de modelos" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:447 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:449 #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 msgid "Alpha" msgstr "Alfa" @@ -6531,7 +6559,7 @@ msgstr "Tipo de formulario de calidade" msgid "work report has not this label type assigned" msgstr "o parte de traballo non ten este tipo de etiqueta asignado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1192 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1201 msgid "Limiting assignment" msgstr "Asignación limitante" @@ -6551,7 +6579,7 @@ msgstr " horas" msgid "The name of the criterion is empty." msgstr "O nome do criterio está baleiro." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:132 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:145 msgid "Limiting Resources Planning" @@ -6575,7 +6603,7 @@ msgstr "A data de inicio non pode ser nula" msgid "All project tasks" msgstr "Todas as tarefas do proxecto" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:367 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:375 msgid "LDAP Roles (separated by ;)" msgstr "Roles do LDAP (separados por ;)" @@ -6610,7 +6638,7 @@ msgstr "Axuda sobre a identificación (abre unha ventana nova)" msgid "The length must be greater than 0, and not null." msgstr "A lonxitude debe ser maior que cero e non nula." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:54 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:49 msgid "Not a valid effort duration" msgstr "Non é unha duración de esforzo válida" @@ -6644,13 +6672,13 @@ msgstr "Non se puido atopar o criterio {0}" msgid "Apply filtering to tasks satisfying required criteria" msgstr "Aplicar filtrado ás tarefas que satisfán os criterios requeridos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:345 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:37 msgid "Task Scheduling Status In Project" msgstr "Estado de planificación de tarefas en proxecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:261 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:863 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:263 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:871 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:356 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313 msgid "Confirm" @@ -6711,22 +6739,22 @@ msgstr "Etiquetas sen herdanza" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:451 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:324 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:272 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:293 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:271 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:289 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:163 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1242 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1250 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1207 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1193 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:201 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:333 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:406 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:646 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:648 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:408 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:955 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:961 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:983 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:989 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:264 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:84 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43 @@ -6741,20 +6769,20 @@ msgstr "Etiquetas sen herdanza" #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99 #: libreplan-webapp/src/main/webapp/materials/materials.zul:104 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:117 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:116 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:68 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:107 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:137 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:109 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:139 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:40 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:46 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:213 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212 #: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:59 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:57 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67 #: libreplan-webapp/src/main/webapp/templates/_list.zul:53 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55 @@ -6814,6 +6842,10 @@ msgstr "Inglés" msgid "Russian" msgstr "Ruso" +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:39 +msgid "Portuguese" +msgstr "Portugués" + #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:172 msgid "unlimited" msgstr "ilimitado" diff --git a/libreplan-webapp/src/main/resources/i18n/keys.pot b/libreplan-webapp/src/main/resources/i18n/keys.pot index 5a8cb2855..98253c0a8 100644 --- a/libreplan-webapp/src/main/resources/i18n/keys.pot +++ b/libreplan-webapp/src/main/resources/i18n/keys.pot @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-11 09:11+0100\n" +"POT-Creation-Date: 2011-11-25 11:40+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,7 +25,7 @@ msgstr "" msgid "The resource cannot be null" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:336 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:341 msgid "Group path" msgstr "" @@ -85,12 +85,13 @@ msgstr "" #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:40 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:28 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:81 #: libreplan-webapp/src/main/webapp/materials/materials.zul:61 #: libreplan-webapp/src/main/webapp/materials/materials.zul:86 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:29 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:88 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68 @@ -148,12 +149,12 @@ msgstr "" msgid "It can not be empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 #: libreplan-webapp/src/main/webapp/materials/materials.zul:33 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:97 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:53 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:145 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:55 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:147 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:54 #: libreplan-webapp/src/main/webapp/templates/templates.zul:66 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22 @@ -200,13 +201,13 @@ msgid "Summary" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:445 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 #: libreplan-webapp/src/main/webapp/templates/templates.zul:67 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53 msgid "Quality Forms" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337 msgid "Reports" msgstr "" @@ -236,8 +237,8 @@ msgstr "" msgid "Dedication chart" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:702 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:729 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:689 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:716 msgid "Progress that are reported by quality forms can not be modified" msgstr "" @@ -257,7 +258,7 @@ msgstr "" msgid "Remove limiting resource element" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:136 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:150 msgid "Resource Usage" @@ -272,7 +273,7 @@ msgid "Unassign" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:157 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:296 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:302 msgid "Companies" msgstr "" @@ -280,7 +281,7 @@ msgstr "" msgid "Manual assignment" msgstr "" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:75 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:74 msgid "Quality form items list" msgstr "" @@ -300,7 +301,7 @@ msgstr "" msgid "generic workers allocation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:890 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:898 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:308 msgid "The project has no scheduled elements" msgstr "" @@ -344,7 +345,7 @@ msgstr "" msgid "changing perspective" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:31 msgid "Transfer Projects Between Scenarios" msgstr "" @@ -365,11 +366,11 @@ msgid "Project Name" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:938 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:966 msgid "Indent" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:312 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:314 msgid "Save passwords in database" msgstr "" @@ -403,7 +404,7 @@ msgstr "" msgid "Locations" msgstr "" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:78 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:77 msgid "New quality form item" msgstr "" @@ -411,7 +412,7 @@ msgstr "" msgid "LibrePlan: Labels" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:242 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:269 msgid "LDAP connection was successful" msgstr "" @@ -419,11 +420,6 @@ msgstr "" msgid "Login name" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:81 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 -msgid "LibrePlan user" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:84 msgid "{0} List" msgstr "" @@ -451,7 +447,7 @@ msgid "" msgstr "" #: libreplan-webapp/src/main/webapp/orders/_edition.zul:50 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:53 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:52 #: libreplan-webapp/src/main/webapp/templates/templates.zul:65 msgid "Criterion Requirement" msgstr "" @@ -500,6 +496,10 @@ msgid "" "can't be added" msgstr "" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:334 +msgid "Role search strategy" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:478 msgid "Error on showing warning message removing calendar: " msgstr "" @@ -514,11 +514,11 @@ msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:44 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:47 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:46 msgid "Imputed hours" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:37 msgid "Project Costs Per Resource" msgstr "" @@ -554,11 +554,15 @@ msgid "" "criterionSatisfaction from the same criterionType" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:336 +msgid "Group strategy" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 msgid "Work Report Lines" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1546 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1555 msgid "Configure" msgstr "" @@ -569,7 +573,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/settings/settings.zul:58 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:36 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:58 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:50 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:51 msgid "First name" msgstr "" @@ -584,8 +588,8 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:210 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:450 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:827 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:291 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:835 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 msgid "Confirm deleting {0}. Are you sure?" msgstr "" @@ -594,11 +598,11 @@ msgstr "" msgid "Work Reports List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:313 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319 msgid "Accounts" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:85 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:87 msgid "External code" msgstr "" @@ -624,7 +628,7 @@ msgstr "" msgid "resources per day must be not empty and bigger than zero" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:341 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:349 msgid "Backwards" msgstr "" @@ -637,7 +641,7 @@ msgstr "" msgid "Apply filtering to resources satisfying required criteria" msgstr "" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:106 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:105 msgid "Up" msgstr "" @@ -679,6 +683,10 @@ msgid "" "value " msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:245 +msgid "missing worker code in the work report" +msgstr "" + #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55 #: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82 @@ -690,16 +698,12 @@ msgstr "" msgid "End date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:245 -msgid "missing worker code in the work report" -msgstr "" - #: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:89 msgid "profile name is already being used by another profile" msgstr "" #: libreplan-webapp/src/main/webapp/settings/settings.zul:68 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:76 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:78 msgid "E-mail" msgstr "" @@ -713,8 +717,8 @@ msgstr "" msgid "The task code cannot be null" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:593 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:594 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:327 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 @@ -761,7 +765,7 @@ msgstr "" msgid "Personal data" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:733 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:720 msgid "Calculated progress can not be removed" msgstr "" @@ -785,11 +789,11 @@ msgstr "" msgid "June" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1038 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1066 msgid "Modified" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:216 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:215 msgid "Add Criterion" msgstr "" @@ -797,7 +801,7 @@ msgstr "" msgid "You can not remove the current scenario" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:653 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:680 msgid "format prefix invalid. It cannot be empty or contain whitespaces." msgstr "" @@ -842,7 +846,7 @@ msgstr "" msgid "Average of worked hours in finished applications" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:706 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:693 msgid "Calculated progress can not be modified" msgstr "" @@ -863,12 +867,12 @@ msgstr "" msgid "Profile" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:346 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:37 msgid "Materials Needs At Date" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:277 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:279 msgid "UserDn" msgstr "" @@ -947,7 +951,7 @@ msgstr "" msgid "NON_LIMITING" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:291 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:297 msgid "Workers" msgstr "" @@ -987,14 +991,14 @@ msgstr "" msgid "Date Start" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1275 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1261 msgid "Value is not valid, the current value must be less than max value" msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 -#: libreplan-webapp/src/main/webapp/planner/order.zul:108 +#: libreplan-webapp/src/main/webapp/planner/order.zul:105 msgid "Value" msgstr "" @@ -1007,7 +1011,7 @@ msgid "there are no valid periods for this calendar" msgstr "" #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:54 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:93 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:95 msgid "Add role" msgstr "" @@ -1016,8 +1020,8 @@ msgstr "" msgid "Exception end date should be greater or equals than start date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:443 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:453 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:444 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:454 msgid "Repeated Project code {0} in Project {1}" msgstr "" @@ -1048,11 +1052,11 @@ msgid "Type data" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:117 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:314 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 msgid "Profiles" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:256 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:258 msgid "Host" msgstr "" @@ -1112,7 +1116,7 @@ msgstr "" msgid "Critical path" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:260 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:262 msgid "" "Deleting this item, it will disable the report progress option. Are you sure?" msgstr "" @@ -1152,11 +1156,11 @@ msgid "Cancel changes and back to scheduling" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:386 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86 #: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:65 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68 -#: libreplan-webapp/src/main/webapp/planner/order.zul:109 +#: libreplan-webapp/src/main/webapp/planner/order.zul:106 msgid "Percentage" msgstr "" @@ -1199,12 +1203,12 @@ msgstr "" msgid "Profiles List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:580 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:581 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:689 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:236 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:919 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:51 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:329 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:914 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:50 #: libreplan-webapp/src/main/webapp/templates/templates.zul:64 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:68 @@ -1215,12 +1219,12 @@ msgstr "" msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 msgid "Data Types" msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:155 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:157 msgid "Total hours" msgstr "" @@ -1285,13 +1289,13 @@ msgstr "" #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:74 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:131 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:133 #: libreplan-webapp/src/main/webapp/common/configuration.zul:139 -#: libreplan-webapp/src/main/webapp/planner/order.zul:154 +#: libreplan-webapp/src/main/webapp/planner/order.zul:151 msgid "Calendar" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:301 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:307 #: libreplan-webapp/src/main/webapp/common/configuration.zul:119 msgid "Resources" msgstr "" @@ -1325,11 +1329,15 @@ msgstr "" msgid "worker's first name not specified" msgstr "" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:337 +msgid "Property strategy" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:281 msgid "date not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:264 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:196 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:206 msgid "Projects Planning" @@ -1339,13 +1347,13 @@ msgstr "" msgid "Shrink to fit page width" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:773 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:760 msgid "The max value must be greater than 0" msgstr "" #: libreplan-webapp/src/main/webapp/settings/settings.zul:63 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:70 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:55 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:56 msgid "Last name" msgstr "" @@ -1370,11 +1378,11 @@ msgstr "" msgid "Progress Type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1295 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1304 msgid "Task contains consolidated progress. Cannot apply sigmoid function." msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:305 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:307 msgid "UserId" msgstr "" @@ -1397,7 +1405,7 @@ msgstr "" msgid "Create New Project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1430 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1439 msgid "Stretches list" msgstr "" @@ -1409,7 +1417,7 @@ msgstr "" msgid "Zoom" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:829 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:833 #: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:205 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:185 @@ -1428,16 +1436,16 @@ msgstr "" #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112 #: libreplan-webapp/src/main/webapp/materials/materials.zul:115 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:39 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:132 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:131 #: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:64 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:76 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:81 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:151 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 #: libreplan-webapp/src/main/webapp/templates/templates.zul:135 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:376 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:384 msgid "Save" msgstr "" @@ -1450,9 +1458,9 @@ msgstr "" msgid "Material categories" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:273 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:576 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:674 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:300 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:603 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:701 msgid "number of digits must be between {0} and {1}" msgstr "" @@ -1480,7 +1488,8 @@ msgstr "" msgid "Entity type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:263 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:271 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1023 msgid "Unsaved changes will be lost. Are you sure?" msgstr "" @@ -1534,11 +1543,11 @@ msgstr "" msgid "Overload due to current project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:907 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:902 msgid "Name: {0}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:874 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:902 msgid "Move down" msgstr "" @@ -1570,12 +1579,12 @@ msgstr "" msgid "BAC" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:379 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:381 msgid "Calculate Number of Hours" msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:105 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:104 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38 msgid "Assign" @@ -1585,7 +1594,7 @@ msgstr "" msgid "missing code in a criterion" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1273 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1281 msgid "Create Template" msgstr "" @@ -1741,7 +1750,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:87 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 -#: libreplan-webapp/src/main/webapp/planner/order.zul:110 +#: libreplan-webapp/src/main/webapp/planner/order.zul:107 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:48 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 @@ -1758,7 +1767,7 @@ msgstr "" msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:651 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:678 msgid "" "format prefix invalid. It cannot be empty or contain '_' or whitespaces." msgstr "" @@ -1773,7 +1782,7 @@ msgstr "" msgid "The criterion and its type cannot be null" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:421 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:422 msgid "The quality form must have an item with 100% value to report progress" msgstr "" @@ -1785,6 +1794,10 @@ msgstr "" msgid "The code is not valid. There is another unit type with the same code" msgstr "" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 +msgid "Enable LDAP authentication" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:490 msgid "( max: {0} )" msgstr "" @@ -1805,6 +1818,7 @@ msgstr "" msgid "Select queue" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1499 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:173 msgid "project name already being used" msgstr "" @@ -1813,7 +1827,7 @@ msgstr "" msgid "Work description" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:63 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:61 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:59 msgid "Split assignment" msgstr "" @@ -1837,7 +1851,7 @@ msgstr "" msgid "direct link" msgstr "" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:112 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:111 msgid "Down" msgstr "" @@ -1851,12 +1865,12 @@ msgstr "" msgid "Label" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:841 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:869 msgid "Value is not valid, taking into account the current list of HoursGroup" msgstr "" #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:51 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:90 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:92 msgid "Association with roles" msgstr "" @@ -1868,8 +1882,8 @@ msgstr "" msgid "Quality forms" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:466 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:476 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:467 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:477 msgid "Repeated Hours Group code {0} in Project {1}" msgstr "" @@ -1918,7 +1932,7 @@ msgstr "" msgid "Limiting resource assignation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1224 msgid "" "This progress can not be removed, because it is spread. It is necessary to " "select another progress as spread." @@ -1954,11 +1968,11 @@ msgstr "" msgid "Resource cannot be null" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:453 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:455 msgid "Total Hours" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:366 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:374 msgid "LibrePlan Role" msgstr "" @@ -1970,28 +1984,32 @@ msgstr "" msgid "Confirm cancel" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:37 msgid "Work And Progress Per Task" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1523 +msgid "project code already being used" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_edition.zul:40 msgid "WBS (tasks)" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1234 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:455 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:300 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:299 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:465 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:150 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:835 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:870 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:843 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:878 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:264 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:208 msgid "Error on showing removing element: " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:701 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:728 msgid "Deleting sequence" msgstr "" @@ -2060,11 +2078,15 @@ msgstr "" msgid "CutycaptTimeout thread exception" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:22 msgid "Work Report Models" msgstr "" +#: libreplan-webapp/src/main/webapp/materials/materials.zul:73 +msgid "New" +msgstr "" + #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:48 msgid "Date last progress measurement" msgstr "" @@ -2087,7 +2109,7 @@ msgid "" "calendar is derived from this one." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:907 msgid "Value is not valid, the type must be not empty" msgstr "" @@ -2107,21 +2129,16 @@ msgstr "" msgid "Create Task" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 -msgid "LDAP Authentication enabled" -msgstr "" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27 msgid "External company" msgstr "" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:66 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:60 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:99 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:129 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:101 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:131 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:27 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 @@ -2141,7 +2158,7 @@ msgstr "" msgid "Start hour" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:140 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:139 msgid "Assign materials" msgstr "" @@ -2160,7 +2177,7 @@ msgstr "" msgid "ID" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:349 msgid "Settings" msgstr "" @@ -2200,7 +2217,7 @@ msgstr "" msgid "Unallocated name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:895 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:923 msgid "Move up" msgstr "" @@ -2213,14 +2230,14 @@ msgid "Subcontract communication date" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:281 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:263 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:359 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:269 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:365 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:131 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:134 msgid "Scheduling" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:126 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:128 msgid "Dependencies have priority" msgstr "" @@ -2252,9 +2269,9 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:915 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:910 #: libreplan-webapp/src/main/webapp/orders/_list.zul:35 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:159 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:161 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53 msgid "State" @@ -2264,11 +2281,11 @@ msgstr "" msgid "Must start after" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1306 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1315 msgid "Confirm change" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:840 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:848 msgid "You don't have permissions to edit this project" msgstr "" @@ -2307,7 +2324,7 @@ msgstr "" msgid "New task" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:192 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:191 msgid "The password for a new user cannot be empty" msgstr "" @@ -2394,7 +2411,7 @@ msgstr "" msgid "Value is not valid, the default max value must not be empty " msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:343 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:349 msgid "Role property" msgstr "" @@ -2419,21 +2436,21 @@ msgstr "" msgid "Activation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310 msgid "Scenarios" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:376 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:375 msgid "Materials saved" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1252 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238 msgid "" "This progress measurement can not be in current date, because it is " "consolidated. it is necessary to select other date." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:334 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:37 msgid "Total Worked Hours By Resource In A Month" msgstr "" @@ -2450,7 +2467,7 @@ msgstr "" msgid "At least one {0} sequence must be active" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:130 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:26 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 @@ -2473,7 +2490,7 @@ msgstr "" msgid "At least one {0} sequence is needed" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:37 msgid "Estimated/Planned Hours Per Task" msgstr "" @@ -2486,7 +2503,11 @@ msgstr "" msgid "Assigned" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:45 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:244 +msgid "Use LDAP roles" +msgstr "" + +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:44 msgid "Details" msgstr "" @@ -2523,7 +2544,7 @@ msgstr "" msgid "LibrePlan: Work And Progress Per Task" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:350 msgid "Change Password" msgstr "" @@ -2531,14 +2552,15 @@ msgstr "" msgid "Projects" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:264 -msgid "Confirm exit dialog" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/converters/ConverterFactory.java:64 msgid "Not found converter for {0}" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:272 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1024 +msgid "Confirm exit dialog" +msgstr "" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:70 msgid "Material assignments" msgstr "" @@ -2565,7 +2587,7 @@ msgstr "" msgid "Question" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1249 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1235 msgid "" "This progress measurement can not be changed or removed, because it is " "consolidated. It is needed to remove its consolidation." @@ -2618,7 +2640,7 @@ msgstr "" msgid "Output format" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:44 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:47 msgid "Print" msgstr "" @@ -2653,25 +2675,24 @@ msgstr "" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:41 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:138 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:137 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:70 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:80 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:85 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:157 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:88 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:142 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:141 #: libreplan-webapp/src/main/webapp/templates/templates.zul:139 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:100 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:379 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:387 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:50 -#: libreplan-webapp/src/main/webapp/planner/order.zul:73 -#: libreplan-webapp/src/main/webapp/planner/order.zul:134 -#: libreplan-webapp/src/main/webapp/planner/order.zul:169 +#: libreplan-webapp/src/main/webapp/planner/order.zul:131 +#: libreplan-webapp/src/main/webapp/planner/order.zul:166 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:91 #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42 -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:48 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:81 msgid "Cancel" msgstr "" @@ -2700,8 +2721,8 @@ msgstr "" msgid "CPI" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:687 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:695 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:907 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:318 msgid "You don't have read access to this project" msgstr "" @@ -2766,11 +2787,11 @@ msgstr "" msgid "Delete selected task" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java:130 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java:126 msgid "{0} (max: {1})" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:470 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:471 msgid "end" msgstr "" @@ -2778,7 +2799,7 @@ msgstr "" msgid "Cost Category" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:350 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:357 msgid "Role search query" msgstr "" @@ -2804,7 +2825,7 @@ msgstr "" msgid "Start date cannot be null" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304 msgid "Subcontracting" msgstr "" @@ -2812,7 +2833,7 @@ msgstr "" msgid "references" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1278 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1264 msgid "Value is not valid, the Precision value must be exact " msgstr "" @@ -2832,7 +2853,7 @@ msgstr "" msgid "Add criterion requirement" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:855 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:863 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 " @@ -2872,7 +2893,7 @@ msgstr "" msgid "please, select a label" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:123 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:125 msgid "Add profile" msgstr "" @@ -2894,7 +2915,7 @@ msgstr "" msgid "Criterion name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:131 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:127 msgid "values are not valid, the values must not be null" msgstr "" @@ -2912,7 +2933,7 @@ msgstr "" msgid "cost assignment's resource not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:127 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:132 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:132 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 @@ -2946,7 +2967,7 @@ msgid "the name must be not empty" msgstr "" #: libreplan-webapp/src/main/webapp/materials/materials.zul:85 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:71 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:72 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:27 msgid "Disabled" msgstr "" @@ -2982,8 +3003,8 @@ msgid "" "Please save your project before proceeding." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1114 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1129 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1109 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1124 msgid "{0} not supported yet" msgstr "" @@ -3004,7 +3025,7 @@ msgstr "" msgid "Resources Load" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:214 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:241 msgid "Changes have been canceled" msgstr "" @@ -3012,7 +3033,7 @@ msgstr "" msgid "LibrePlan: Hours Worked Per Worker In A Month" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:297 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:299 msgid "Authentication" msgstr "" @@ -3074,7 +3095,7 @@ msgstr "" msgid "Select start date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:877 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:885 msgid "Removed {0}" msgstr "" @@ -3092,7 +3113,7 @@ msgid "Group name" msgstr "" #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:59 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:98 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:100 msgid "Role name" msgstr "" @@ -3134,11 +3155,11 @@ msgstr "" msgid "Assign selected items" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:449 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:450 msgid "init" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1215 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1201 msgid "Add new progress measurement" msgstr "" @@ -3146,7 +3167,7 @@ msgstr "" msgid "Select for automatic queuing" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 msgid "Scenarios Management" msgstr "" @@ -3158,7 +3179,7 @@ msgstr "" msgid "Create & Assign" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1549 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1558 msgid "Not configurable" msgstr "" @@ -3166,7 +3187,7 @@ msgstr "" msgid "Advanced allocation" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/order.zul:111 +#: libreplan-webapp/src/main/webapp/planner/order.zul:108 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:93 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:96 msgid "Consolidated" @@ -3201,7 +3222,7 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:67 #: libreplan-webapp/src/main/webapp/orders/_list.zul:32 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:109 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:111 msgid "Customer" msgstr "" @@ -3216,17 +3237,19 @@ msgstr "" msgid "criterion type name not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:246 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:273 msgid "Cannot connect to LDAP server" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:220 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:219 msgid "Add Exception" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:301 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:322 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:346 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:303 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:324 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:348 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:378 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:219 msgid "cannot be empty" msgstr "" @@ -3307,8 +3330,8 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:441 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:443 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:930 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:94 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 @@ -3336,7 +3359,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77 #: libreplan-webapp/src/main/webapp/materials/materials.zul:58 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:42 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:84 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66 @@ -3350,7 +3373,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:51 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:40 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:35 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 #: libreplan-webapp/src/main/webapp/orders/_list.zul:28 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:72 #: libreplan-webapp/src/main/webapp/templates/templates.zul:80 @@ -3401,11 +3424,11 @@ msgstr "" msgid "Companies List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1453 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1462 msgid "Stretches with Interpolation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:333 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:37 msgid "Hours Worked Per Resource" msgstr "" @@ -3492,22 +3515,22 @@ msgstr "" msgid "Virtual Workers Group" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:198 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:225 msgid "Changes saved" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1258 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1266 msgid "See scheduling" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:341 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:328 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:331 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:107 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110 msgid "Progress measurements" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1214 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1200 msgid "Add measure" msgstr "" @@ -3536,7 +3559,7 @@ msgstr "" msgid "End" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1360 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1346 msgid "The date is not valid, the date must be not empty" msgstr "" @@ -3545,7 +3568,7 @@ msgid "User login name" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:534 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 msgid "Cost Categories" msgstr "" @@ -3571,7 +3594,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:27 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:55 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:57 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:56 msgid "Task quality forms" msgstr "" @@ -3588,7 +3611,7 @@ msgstr "" msgid "Cost category" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:700 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:727 msgid "It can not be deleted. At least one sequence is necessary." msgstr "" @@ -3638,26 +3661,26 @@ msgstr "" msgid "Time finish cannot be null" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:116 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:118 msgid "Customer reference" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:688 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:841 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:891 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:900 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:927 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:696 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:849 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:908 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:935 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:146 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:319 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:360 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:309 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:319 msgid "Information" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:926 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:934 msgid "Sorry, you do not have permissions to access this project" msgstr "" @@ -3677,6 +3700,10 @@ msgstr "" msgid "New hours group " msgstr "" +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45 +msgid "Please remember that only saved changes will be printed" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:464 msgid "Assign element to queue manually" msgstr "" @@ -3689,11 +3716,11 @@ msgstr "" msgid "Resource: {0} " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:358 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:360 msgid "percentage cannot be duplicated" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 msgid "Work Hours" msgstr "" @@ -3747,8 +3774,8 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:154 #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:182 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java:173 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:305 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:307 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:328 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:221 msgid "{0} already exists" msgstr "" @@ -3766,20 +3793,20 @@ msgid "Code " msgstr "" #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:66 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:65 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:66 msgid "Password confirmation" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:88 -msgid "Work Report" -msgstr "" - #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:71 msgid "Indent selected task" msgstr "" +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:88 +msgid "Work Report" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:189 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:330 #: libreplan-webapp/src/main/webapp/common/configuration.zul:135 msgid "Unit Measures" msgstr "" @@ -3789,11 +3816,11 @@ msgstr "" msgid "Show progress" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:142 msgid "Work" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:297 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:298 msgid "" "Error saving the project\n" "{0}" @@ -3811,9 +3838,9 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:630 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:298 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:299 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:121 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1296 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305 msgid "Error" msgstr "" @@ -3850,7 +3877,7 @@ msgid "" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationCommand.java:67 -#: libreplan-webapp/src/main/webapp/planner/order.zul:83 +#: libreplan-webapp/src/main/webapp/planner/order.zul:80 msgid "Progress consolidation" msgstr "" @@ -3879,7 +3906,7 @@ msgstr "" msgid "Task Information" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:140 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:145 msgid "Hours Group at " msgstr "" @@ -3900,7 +3927,7 @@ msgstr "" msgid "Budgeted Cost Work Scheduled" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 msgid "Changes applied" msgstr "" @@ -3932,7 +3959,7 @@ msgstr "" msgid "criterion type does not allow resource hierarchy" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:150 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:152 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:95 msgid "Total" @@ -3955,8 +3982,8 @@ msgstr "" msgid "Select destination" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/order.zul:92 -#: libreplan-webapp/src/main/webapp/planner/order.zul:98 +#: libreplan-webapp/src/main/webapp/planner/order.zul:89 +#: libreplan-webapp/src/main/webapp/planner/order.zul:95 msgid "Check consolidated progresses" msgstr "" @@ -3984,7 +4011,7 @@ msgid "Apply tab changes" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:93 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:171 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:170 msgid "passwords don't match" msgstr "" @@ -4012,7 +4039,7 @@ msgstr "" msgid "Value last progress reported" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306 msgid "Report Progress" msgstr "" @@ -4020,7 +4047,7 @@ msgstr "" msgid "Show dependencies" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:347 msgid "Schedule from start to deadline" msgstr "" @@ -4056,7 +4083,7 @@ msgstr "" msgid "LibrePlan: Work Hours" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 msgid "LibrePlan Configuration" msgstr "" @@ -4103,7 +4130,7 @@ msgstr "" msgid "In the available periods {0} only {1} hours are available." msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:118 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:120 msgid "Association with profiles" msgstr "" @@ -4137,11 +4164,11 @@ msgstr "" msgid "Average of estimated hours" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:270 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:272 msgid "Base" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:682 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:683 msgid "" "You can not remove the task \"{0}\" because of this or any of its children " "are already in use in some work reports" @@ -4159,7 +4186,7 @@ msgstr "" msgid "Worker deleted" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:733 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:760 msgid "Select entity, please" msgstr "" @@ -4250,7 +4277,7 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:382 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:136 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:157 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:84 msgid "Position" msgstr "" @@ -4276,7 +4303,7 @@ msgstr "" msgid "A description field of the same name already exists." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1177 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1163 msgid "" "Progress measurements that are reported by quality forms can not be removed" msgstr "" @@ -4321,7 +4348,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33 #: libreplan-webapp/src/main/webapp/common/configuration.zul:35 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:248 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:250 msgid "Configuration" msgstr "" @@ -4343,11 +4370,11 @@ msgid "Select type" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:678 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:911 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:906 msgid "Hours invested" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:324 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:326 msgid "Authorization" msgstr "" @@ -4356,7 +4383,7 @@ msgid "" "The name is not valid, there is another progress type with the same name. " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:319 msgid "Project saved" msgstr "" @@ -4376,7 +4403,7 @@ msgstr "" msgid "Derived exception" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:292 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298 msgid "Machines" msgstr "" @@ -4384,7 +4411,7 @@ msgstr "" msgid "Unit Measures List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:153 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:149 msgid "Couldn't find element: {0}" msgstr "" @@ -4397,7 +4424,7 @@ msgstr "" msgid "unit type code not found" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:348 msgid "My account" msgstr "" @@ -4413,7 +4440,7 @@ msgstr "" msgid "Both" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:758 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:764 msgid "Not editable for containing more that an hours group." msgstr "" @@ -4427,7 +4454,7 @@ msgid "Limiting resource" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/calendar/CalendarAllocationCommand.java:58 -#: libreplan-webapp/src/main/webapp/planner/order.zul:146 +#: libreplan-webapp/src/main/webapp/planner/order.zul:143 msgid "Calendar allocation" msgstr "" @@ -4441,7 +4468,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/materials/materials.zul:84 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:32 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:120 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:119 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33 msgid "Category" msgstr "" @@ -4459,7 +4486,7 @@ msgstr "" msgid "Category data" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:103 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:102 msgid "Search" msgstr "" @@ -4500,11 +4527,11 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1700 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:425 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:651 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1323 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:669 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1331 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:670 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:254 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:337 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:259 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:251 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:141 msgid "must be lower than finish date" msgstr "" @@ -4534,7 +4561,7 @@ msgstr "" msgid "Could not load any resource" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:335 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:341 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:37 msgid "Work And Progress Per Project" msgstr "" @@ -4596,8 +4623,8 @@ msgstr "" msgid "Unit type code cannot be empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:184 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:183 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318 msgid "Users" msgstr "" @@ -4707,11 +4734,11 @@ msgstr "" msgid "Load due to current project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1314 msgid "You are going to change the assignment function. Are you sure?" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:328 msgid "Exception Days" msgstr "" @@ -4732,13 +4759,13 @@ msgstr "" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:114 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:40 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:135 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:134 #: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:67 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:78 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:83 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 #: libreplan-webapp/src/main/webapp/templates/templates.zul:137 msgid "Save & Continue" msgstr "" @@ -4747,7 +4774,7 @@ msgstr "" msgid "LibrePlan: Work And Progress Per Project" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:90 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:92 msgid "Scheduling mode" msgstr "" @@ -4787,11 +4814,16 @@ msgstr "" msgid "The periods available depend on the resource's calendar." msgstr "" +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:83 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 +msgid "Authentication type" +msgstr "" + #: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:55 msgid "START" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:342 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:350 msgid "Schedule from the deadline to start" msgstr "" @@ -4803,8 +4835,9 @@ msgstr "" msgid "Non limiting resource assignation" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:87 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:86 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75 +#: libreplan-webapp/src/main/webapp/planner/order.zul:70 #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68 msgid "Back" msgstr "" @@ -4823,11 +4856,11 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1682 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:634 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1306 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:651 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1314 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:652 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:237 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:318 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:242 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:234 msgid "must be greater than start date" msgstr "" @@ -4852,7 +4885,7 @@ msgstr "" msgid "Unit measure name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:144 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:140 msgid "cannot include a progress of the same progress type twice" msgstr "" @@ -4909,7 +4942,7 @@ msgstr "" msgid "Removed calendar \"{0}\"" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1063 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1071 msgid "Create project" msgstr "" @@ -4922,7 +4955,7 @@ msgid "" "Allow multiple values of this type of criterion in the same period of time" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1294 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1280 msgid "" "The date is not valid, the date must be unique for this progress assignment" msgstr "" @@ -4955,11 +4988,11 @@ msgstr "" msgid "Root calendar" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:263 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:265 msgid "Port" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:862 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:870 msgid "" "Deleting this subcontracted project, you are going to lose the relation to " "report progress. Are you sure?" @@ -4996,7 +5029,7 @@ msgstr "" msgid "missing code in a hour cost" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:870 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:858 msgid "All workers" msgstr "" @@ -5017,12 +5050,14 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:121 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:123 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:311 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:207 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:307 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1492 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1516 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:115 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:168 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:738 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:765 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:134 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:58 @@ -5051,7 +5086,6 @@ msgstr "" #: libreplan-webapp/src/main/webapp/users/_editUser.zul:46 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:37 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:45 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:39 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96 msgid "cannot be null or empty" @@ -5070,7 +5104,7 @@ msgstr "" msgid "The progress type cannot be modified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:392 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:394 msgid "Calculate Resources per Day" msgstr "" @@ -5084,7 +5118,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/materials/materials.zul:83 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:29 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 msgid "Unit type" msgstr "" @@ -5105,7 +5139,7 @@ msgstr "" msgid "Calendar data" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:294 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300 msgid "Work Reports" msgstr "" @@ -5144,8 +5178,8 @@ msgstr "" msgid "Customer Reference" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:134 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:147 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:130 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:143 msgid "spread values are not valid, at least one value should be true" msgstr "" @@ -5175,12 +5209,12 @@ msgid "" "the Configuration window before." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:600 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:601 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:677 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:908 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:903 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:46 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:49 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:48 #: libreplan-webapp/src/main/webapp/templates/templates.zul:63 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 msgid "Progress" @@ -5192,7 +5226,7 @@ msgid "" "or resources" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1224 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1210 msgid "All progress types have already been assigned." msgstr "" @@ -5204,7 +5238,7 @@ msgstr "" msgid "Project: {0} " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:315 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 msgid "Calendars" msgstr "" @@ -5241,7 +5275,7 @@ msgstr "" msgid "Error on showing delete confirm" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:623 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:625 msgid "Sum of all rows" msgstr "" @@ -5290,7 +5324,7 @@ msgstr "" msgid "Active" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1261 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1247 msgid "This progress measurement can not be in " msgstr "" @@ -5298,19 +5332,19 @@ msgstr "" msgid "Inherited labels" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1246 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1232 msgid "" "This progress can not be changed or removed, because it has got consolidated " "progress. It is needed to remove the consolidation on all its progress." msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:917 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:945 msgid "Unindent" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:935 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1384 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1370 msgid "Value is not valid, the current value must be not empty" msgstr "" @@ -5338,7 +5372,7 @@ msgstr "" msgid "missing code in a work report line" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:928 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:937 msgid "Efforts" msgstr "" @@ -5346,7 +5380,7 @@ msgstr "" msgid "Show all reported hours" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:102 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:113 msgid "Projects List" @@ -5365,7 +5399,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:46 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:46 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:80 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:82 msgid "Generate code" msgstr "" @@ -5377,14 +5411,10 @@ msgstr "" msgid "This template can not be removed because it has applications." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:486 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:513 msgid "The code sequence is already in use and it can not be updated." msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:332 -msgid "Import LDAP roles" -msgstr "" - #: libreplan-webapp/src/main/webapp/settings/settings.zul:43 msgid "Personal Data" msgstr "" @@ -5401,7 +5431,7 @@ msgstr "" msgid "Number of iterations should be between 1 and " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:142 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:149 msgid "Scenarios must be enabled as more elements than master exist" msgstr "" @@ -5419,7 +5449,7 @@ msgstr "" msgid "Profiles authorization" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:293 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 msgid "Virtual Workers Groups" msgstr "" @@ -5481,9 +5511,9 @@ msgid "All projects" msgstr "" #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:41 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:60 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:61 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:83 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:284 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:286 msgid "Password" msgstr "" @@ -5492,7 +5522,7 @@ msgstr "" msgid "Observations" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:942 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:950 msgid "Edit project" msgstr "" @@ -5531,7 +5561,7 @@ msgstr "" msgid "Current password is incorrect" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:367 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:366 msgid "Cannot insert material in general view. Please, select a category" msgstr "" @@ -5552,9 +5582,8 @@ msgstr "" #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:86 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:98 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:48 -#: libreplan-webapp/src/main/webapp/planner/order.zul:70 -#: libreplan-webapp/src/main/webapp/planner/order.zul:131 -#: libreplan-webapp/src/main/webapp/planner/order.zul:166 +#: libreplan-webapp/src/main/webapp/planner/order.zul:128 +#: libreplan-webapp/src/main/webapp/planner/order.zul:163 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:89 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:79 #: libreplan-webapp/src/main/webapp/planner/main.zul:66 @@ -5562,14 +5591,14 @@ msgid "Accept" msgstr "" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:81 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:259 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:266 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:273 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:280 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:308 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:339 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:346 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:261 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:268 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:275 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:282 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:310 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:345 #: libreplan-webapp/src/main/webapp/common/configuration.zul:353 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:361 msgid "Example: {0}" msgstr "" @@ -5591,7 +5620,7 @@ msgstr "" msgid "Completed: {0}% " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1181 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1167 msgid "Calculated progress measurement can not be removed" msgstr "" @@ -5692,9 +5721,9 @@ msgstr "" #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:41 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:26 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:115 #: libreplan-webapp/src/main/webapp/orders/_list.zul:29 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:76 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:77 #: libreplan-webapp/src/main/webapp/templates/templates.zul:85 #: libreplan-webapp/src/main/webapp/templates/_list.zul:26 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 @@ -5717,7 +5746,7 @@ msgstr "" msgid "Assignation type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:367 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:369 msgid "Calculate Workable Days" msgstr "" @@ -5745,7 +5774,7 @@ msgstr "" msgid "Operation cannot be done" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:138 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 msgid "Budget" msgstr "" @@ -5840,7 +5869,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:43 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:59 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:120 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:122 #: libreplan-webapp/src/main/webapp/templates/templates.zul:101 #: libreplan-webapp/src/main/webapp/templates/_list.zul:32 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 @@ -5861,11 +5890,11 @@ msgid "already exists an allocation for criteria {0}" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:283 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:294 msgid "Project Templates" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:347 msgid "Forward" msgstr "" @@ -5883,7 +5912,7 @@ msgstr "" msgid "Unnasigned" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:179 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:178 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:74 #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:165 @@ -5910,7 +5939,7 @@ msgstr "" msgid "Multiple values per resource" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:62 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:60 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58 msgid "Split" msgstr "" @@ -5933,7 +5962,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:45 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:56 #: libreplan-webapp/src/main/webapp/orders/_list.zul:30 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:94 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:96 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:51 msgid "Starting date" msgstr "" @@ -5946,7 +5975,7 @@ msgstr "" msgid "Load 100%" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:934 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:943 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:84 msgid "Function" msgstr "" @@ -5956,7 +5985,7 @@ msgstr "" msgid "date in future" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:851 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:855 msgid "New project version" msgstr "" @@ -5973,8 +6002,8 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:364 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1226 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:483 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1234 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:484 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:77 #: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:537 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:78 @@ -6004,7 +6033,7 @@ msgstr "" msgid "Init date" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:104 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:106 msgid "Responsible" msgstr "" @@ -6012,7 +6041,7 @@ msgstr "" msgid "New password" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:352 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:354 msgid "percentage must be in range (0,100]" msgstr "" @@ -6048,7 +6077,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/materials/materials.zul:82 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:30 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:119 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 msgid "Unit price" msgstr "" @@ -6134,8 +6163,8 @@ msgstr "" msgid "Enable/Disable" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1282 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1304 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1268 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1290 msgid "" "Value is not valid, the value must be greater than the value of the previous " "progress." @@ -6176,7 +6205,7 @@ msgstr "" msgid "unl" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:290 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:292 msgid "Test LDAP connection" msgstr "" @@ -6194,11 +6223,11 @@ msgstr "" msgid "Actual Cost Work Performed" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:172 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:177 msgid "Create project from Template" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:417 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:418 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" @@ -6213,7 +6242,7 @@ msgstr "" msgid "Must start after (days since beginning project)" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:850 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:854 msgid "" "Confirm creating a new project version for this scenario and derived. Are " "you sure?" @@ -6224,7 +6253,6 @@ msgstr "" #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:72 #: libreplan-webapp/src/main/webapp/materials/materials.zul:45 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:73 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:59 @@ -6266,7 +6294,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:62 #: libreplan-webapp/src/main/webapp/orders/_list.zul:31 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:99 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:101 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46 msgid "Deadline" msgstr "" @@ -6275,7 +6303,7 @@ msgstr "" msgid "Tasks" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 msgid "Subcontracted Tasks" msgstr "" @@ -6306,7 +6334,7 @@ msgstr "" msgid "Advanced Allocation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 msgid "Administration / Management" msgstr "" @@ -6318,7 +6346,7 @@ msgstr "" msgid "Template Tree" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:447 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:449 #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 msgid "Alpha" msgstr "" @@ -6376,7 +6404,7 @@ msgstr "" msgid "work report has not this label type assigned" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1192 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1201 msgid "Limiting assignment" msgstr "" @@ -6396,7 +6424,7 @@ msgstr "" msgid "The name of the criterion is empty." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:132 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:145 msgid "Limiting Resources Planning" @@ -6420,7 +6448,7 @@ msgstr "" msgid "All project tasks" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:367 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:375 msgid "LDAP Roles (separated by ;)" msgstr "" @@ -6455,7 +6483,7 @@ msgstr "" msgid "The length must be greater than 0, and not null." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:54 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:49 msgid "Not a valid effort duration" msgstr "" @@ -6489,13 +6517,13 @@ msgstr "" msgid "Apply filtering to tasks satisfying required criteria" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:345 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:37 msgid "Task Scheduling Status In Project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:261 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:863 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:263 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:871 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:356 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313 msgid "Confirm" @@ -6556,22 +6584,22 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:451 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:324 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:272 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:293 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:271 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:289 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:163 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1242 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1250 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1207 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1193 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:201 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:333 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:406 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:646 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:648 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:408 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:955 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:961 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:983 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:989 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:264 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:84 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43 @@ -6586,20 +6614,20 @@ msgstr "" #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99 #: libreplan-webapp/src/main/webapp/materials/materials.zul:104 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:117 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:116 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:68 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:107 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:137 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:109 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:139 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:40 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:46 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:213 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212 #: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:59 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:57 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67 #: libreplan-webapp/src/main/webapp/templates/_list.zul:53 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55 @@ -6659,6 +6687,10 @@ msgstr "" msgid "Russian" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:39 +msgid "Portuguese" +msgstr "" + #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:172 msgid "unlimited" msgstr ""