From 82587f22e770ccc5abe9ffe298f2ec63fd574a60 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Fri, 7 Jan 2011 09:09:11 +0100 Subject: [PATCH] Updated keys.pot and translations. FEA: ItEr67S03CommunityMaterialItEr66S03 --- .../src/main/resources/i18n/es.po | 189 +++++++++--------- .../src/main/resources/i18n/gl.po | 189 +++++++++--------- .../src/main/resources/i18n/keys.pot | 189 +++++++++--------- 3 files changed, 282 insertions(+), 285 deletions(-) diff --git a/navalplanner-webapp/src/main/resources/i18n/es.po b/navalplanner-webapp/src/main/resources/i18n/es.po index 6e73f4268..26dbf961a 100644 --- a/navalplanner-webapp/src/main/resources/i18n/es.po +++ b/navalplanner-webapp/src/main/resources/i18n/es.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-05 11:51+0100\n" +"POT-Creation-Date: 2011-01-07 08:58+0100\n" "PO-Revision-Date: 2011-01-05 13:08+0100\n" "Last-Translator: Manuel Rego Casasnovas \n" "Language-Team: Spanish <>\n" @@ -397,7 +397,7 @@ msgstr "NavalPlan: Error" msgid "Project Name" msgstr "Nombre del proyecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:879 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:908 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:303 msgid "Indent" msgstr "Indentar" @@ -458,7 +458,7 @@ msgstr "falta código en una excepción de calendario" msgid "Current selection" msgstr "Selección actual" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1112 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1109 msgid "" "there exist criterion satisfactions referring to criterion types not " "applicable to this resource" @@ -544,7 +544,7 @@ msgstr "Ubicaciones no asignadas" msgid "Application URI" msgstr "URI de la aplicación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:418 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:415 msgid "" "The {0} is not valid, criterionType overlaps with other " "criterionSatisfaction from the same criterionType" @@ -725,7 +725,7 @@ msgid "The task code cannot be null" msgstr "El código de la tarea no puede ser nulo" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:275 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:643 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:640 #: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:35 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:46 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:45 @@ -796,7 +796,7 @@ msgstr "Junio" msgid "{0} annotation required on {1}" msgstr "{0} anotación obligatoria en {1}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:979 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:1008 msgid "Modified" msgstr "Modificado" @@ -836,6 +836,10 @@ msgstr "Código de la tarea" msgid "Ending date" msgstr "Fecha de fin" +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:75 +msgid "Show all progress" +msgstr "Mostrar todo el progreso" + #: navalplanner-webapp/src/main/webapp/templates/_list.zul:20 msgid "Templates List" msgstr "Lista de plantillas" @@ -1001,7 +1005,7 @@ msgstr "Proyecto del cliente" msgid "Progress Types List" msgstr "Lista de tipos de progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:415 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:412 msgid "" "The {0} can not be assigned to this resource. Its interval overlaps with " "other criterion" @@ -1195,11 +1199,11 @@ msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "" "{0} de la categoría {1} y {2} de la categoría {3} tienen el mismo código" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:850 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:216 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:853 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:215 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:277 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:854 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:630 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:627 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:67 #: navalplanner-webapp/src/main/webapp/templates/templates.zul:63 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 @@ -1229,7 +1233,7 @@ msgid "Filter by task status" msgstr "Filtrar por estado de tarea" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:471 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:423 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:422 msgid "Select date:" msgstr "Seleccione fecha:" @@ -1339,16 +1343,16 @@ msgstr "fecha no especificada" msgid "Select type :" msgstr "Seleccione tipo :" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:73 -msgid "Shrink to fit page width" -msgstr "Reducir para ajustar al ancho de página" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:258 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:268 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:238 msgid "Projects Planning" msgstr "Planificación de proyectos" +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:73 +msgid "Shrink to fit page width" +msgstr "Reducir para ajustar al ancho de página" + #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:66 msgid "Last name" msgstr "Apellidos" @@ -1495,7 +1499,7 @@ msgstr "" "Fecha de fin estimada para la tarea (presione enter en el cuadro de texto " "para abrir el calendario o escriba la fecha directamente)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:342 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:341 msgid "Expand/Collapse all" msgstr "Expandir/Plegar todo" @@ -1503,11 +1507,11 @@ msgstr "Expandir/Plegar todo" msgid "Overload due to current project" msgstr "Sobrecarga debido al proyecto actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:840 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:841 msgid "Name: {0}" msgstr "Nombre: {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:815 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:844 msgid "Move down" msgstr "Mover abajo" @@ -1634,7 +1638,7 @@ msgstr "Seleccionar el calendario padre" msgid "There is no task with this code" msgstr "No hay ninguna tarea con este código " -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:297 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:292 msgid "criterion satisfaction with end date less than start date" msgstr "el criterio satisfecho tiene fecha de fin anterior a la de inicio" @@ -1851,7 +1855,7 @@ msgstr "Etiqueta" msgid "Create Scenario" msgstr "Crear escenario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:782 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:811 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" @@ -1944,6 +1948,11 @@ msgstr "Semana de trabajo" msgid "You will lose the changes. Are you sure?" msgstr "Se perderán los cambios. ¿Está seguro?" +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:26 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:45 +msgid "Company ID" +msgstr "NIF" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:184 msgid "Unit type name cannot be empty" msgstr "El nombre del tipo de unidad no puede ser vacío" @@ -2034,7 +2043,7 @@ msgstr "Crear tipo de parte de trabajo" msgid "Criterion requirement" msgstr "Criterios requeridos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:212 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:211 msgid "" "Still not saved changes would be lost. Are you sure you want to go to create " "a template?" @@ -2172,6 +2181,13 @@ msgstr "Sobreasignable" msgid "format filters are not valid" msgstr "los filtros de formato no son válidos" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:52 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:71 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28 +msgid "ID" +msgstr "NIF" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:341 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:178 msgid "The init date cannot be empty" @@ -2231,7 +2247,7 @@ msgstr "Grupo de horas" msgid "Unallocated name" msgstr "Nombre no asignado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:836 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:865 msgid "Move up" msgstr "Mover arriba" @@ -2275,7 +2291,7 @@ msgstr "Crear nuevo proyecto" msgid "Work done from starting date:" msgstr "Trabajo realizado desde la fecha de inicio:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:847 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:849 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 #: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:42 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:44 @@ -2314,6 +2330,13 @@ msgstr "falta la fecha de una excepción de calendario" msgid "Exception" msgstr "Excepción" +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:107 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:179 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:449 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:514 +msgid "There is no resource with this ID" +msgstr "No hay otro recurso con este NIF" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:191 #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:194 msgid "Send" @@ -2604,14 +2627,14 @@ msgstr "NavalPlan: Calendarios" msgid "{0} not found type for criterion " msgstr "{0} no encontrado tipo para criterio " -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:67 -msgid "Page down" -msgstr "Página abajo" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:394 msgid "Hours cannot be null" msgstr "Las horas no pueden ser nulas" +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:67 +msgid "Page down" +msgstr "Página abajo" + #: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:469 msgid "resource type does not allow enabled criteria" msgstr "el tipo de recurso no permite criterios habilitados" @@ -2719,13 +2742,6 @@ msgstr "" msgid "Task Properties" msgstr "Propiedades de la tarea" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:107 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:179 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:449 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:514 -msgid "There is no resource with this ID" -msgstr "No hay otro recurso con este NIF" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:172 msgid "Cost category saved" msgstr "Categoría de coste guardada" @@ -2756,7 +2772,7 @@ msgstr "Borrar tarea seleccionada" msgid "{0} (max: {1})" msgstr "{0} (máx: {1})" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:522 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:519 msgid "end" msgstr "fin" @@ -2925,8 +2941,8 @@ msgstr "el nombre no puede ser vacío" msgid "Disabled" msgstr "Deshabilitado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:597 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:350 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:596 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:349 msgid "Earned value" msgstr "Valor ganado" @@ -2938,8 +2954,8 @@ msgstr "Editar tipo de horas de trabajo" msgid "From Today" msgstr "A partir de hoy" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1041 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1056 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1044 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1059 msgid "{0} not supported yet" msgstr "{0} aún no soportado" @@ -3054,8 +3070,8 @@ msgstr "Nombre del rol" msgid "This worker was already removed by other user" msgstr "Este trabajador ya ha sido borrado por otro usuario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:677 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:476 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:676 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:475 msgid "h" msgstr "h" @@ -3091,7 +3107,7 @@ msgstr "Añadir hito" msgid "Assign selected items" msgstr "Asignar elementos seleccionados" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:501 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:498 msgid "init" msgstr "inicio" @@ -3415,10 +3431,6 @@ msgstr "Inesperado: {0}" msgid " {0}s" msgstr " {0}s" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:133 -msgid "Worker ID cannot be empty" -msgstr "NIF del trabajador no especificado" - #: navalplanner-webapp/src/main/webapp/planner/main.zul:60 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:49 msgid "Notes" @@ -3659,6 +3671,10 @@ msgstr "acabar no después de" msgid "Work Hours" msgstr "Horas de trabajo" +#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:163 +msgid "Company ID already used. It has to be be unique" +msgstr "NIF de la empresa ya está siendo usado. Debe ser único" + #: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:121 msgid "There is no material category with this code" msgstr "No hay ninguna categoría de materiales con este código" @@ -3683,7 +3699,7 @@ msgstr "Tipo de excepción de calendario no encontrado" msgid "Worker must be not-null" msgstr "El trabajador no debe ser nulo" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1025 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1022 msgid "Some criterion satisfactions overlap in time" msgstr "Algunos criterios satisfechos se solapan en el tiempo" @@ -4083,7 +4099,7 @@ msgstr "Seleccionar origen" msgid "Total dedication" msgstr "Dedicación total" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:748 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:721 msgid "" "You can not remove the task \"{0}\" because of this or any of its children " "are already in use in some work reports" @@ -4108,7 +4124,7 @@ msgstr "Número de dígitos:" msgid "Subcontratation date" msgstr "Fecha de subcontratación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:250 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:249 msgid "" "Templates can only be created from already existent tasks.\n" "Newly tasks cannot be used." @@ -4264,7 +4280,7 @@ msgstr "No ha sido posible cargar la entidad. No encontrada. Id: " msgid "Create Virtual Workers Group" msgstr "Crear grupo de trabajadores virtuales" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:844 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:845 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:843 msgid "Hours invested" msgstr "Horas invertidas" @@ -4287,11 +4303,7 @@ msgstr "tarea :" msgid "ALL" msgstr "TODOS" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:75 -msgid "Show all progress" -msgstr "Mostrar todo el progreso" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:220 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:214 msgid "criterion satisfaction's resource not specified" msgstr "recurso del criterio satisfecho no especificado" @@ -4344,8 +4356,7 @@ msgstr "Vista de la compañía" msgid "NavalPlan: Configuration" msgstr "NavalPlan: Configuración" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:727 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:682 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:733 msgid "Not editable for containing more that an hours group." msgstr "No editable por contener más de un grupo de horas." @@ -4420,7 +4431,7 @@ msgstr "Borrar calendario" #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:506 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:138 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1288 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:734 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:707 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1498 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1662 msgid "must be lower than finish date" @@ -4585,7 +4596,7 @@ msgstr "Usuario guardado" msgid "Task quality form name" msgstr "Nombre del formulario de calidad de tarea" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1055 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1052 msgid "Some cost category assignments overlap in time" msgstr "Algunas asignaciones a categorías de coste se solapan en el tiempo" @@ -4701,7 +4712,7 @@ msgstr "Modo de planificación" msgid "Filter" msgstr "Filtrar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:201 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:200 msgid "Choose a task to operate on it" msgstr "Elija una tarea para operar sobre ella" @@ -4775,7 +4786,7 @@ msgstr "Administración" #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:580 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:489 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1271 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:716 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:689 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1481 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1644 msgid "must be greater than start date" @@ -4894,10 +4905,6 @@ msgstr "tan pronto como sea posible" msgid "The code cannot be empty." msgstr "El código no puede estar vacío" -#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:163 -msgid "Company ID already used. It has to be be unique" -msgstr "NIF de la empresa ya está siendo usado. Debe ser único" - #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:34 msgid "Human hours per machine working hour within configuration unit" msgstr "" @@ -4957,7 +4964,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" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:805 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:806 msgid "All workers" msgstr "Todos los trabajadores" @@ -5140,10 +5147,10 @@ msgstr "Nombre de usuario de nuestra empresa" msgid "Filter work reports" msgstr "Filtrar partes de trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:841 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:842 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:274 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:842 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:650 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:647 #: navalplanner-webapp/src/main/webapp/templates/templates.zul:62 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:48 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:45 @@ -5272,7 +5279,7 @@ msgstr "" "consolidado. Se requiere borrar la consolidación de todas sus medidas de " "progreso." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:858 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:887 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:289 msgid "Unindent" msgstr "Desindentar" @@ -5352,7 +5359,7 @@ msgstr "Seleccione las propiedades de la página de impresión" msgid "NavalPlan: Project Costs Per Resource" msgstr "NavalPlan: costes de proyecto por recurso" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:211 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:205 msgid "criterion satisfaction's criterion not specified" msgstr "criterio del criterio satisfecho no especificado" @@ -5396,18 +5403,6 @@ msgstr "Gráficos de planificación expandidos" msgid "Not deletable" msgstr "Imborrable" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:71 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:36 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:52 -msgid "ID" -msgstr "NIF" - -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:52 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106 -msgid "Company ID" -msgstr "NIF" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:168 msgid "Doing {0} reassignations" msgstr "Realizando {0} reasignaciones" @@ -5435,7 +5430,7 @@ msgstr "" msgid "Criterion Type List" msgstr "Lista de tipos de criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:598 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:597 msgid "Overall progress" msgstr "Progreso global" @@ -5501,7 +5496,7 @@ msgstr "" "No se puede insertar material en la vista general. Por favor, seleccione una " "categoría" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:194 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:192 msgid "criterion satisfaction's start date not specified" msgstr "fecha de inicio del criterio satisfecho no especificada" @@ -5696,7 +5691,7 @@ msgstr "Fecha de inicio" msgid "Update exception" msgstr "Actualizar excepción" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:252 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:251 msgid "Operation cannot be done" msgstr "No se puede efectuar la operación" @@ -5792,8 +5787,8 @@ msgstr "Este tipo de etiqueta ya está asignado al tipo de parte de trabajo." msgid "New criterion" msgstr "Criterio nuevo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:596 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:349 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:595 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:348 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:541 #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:48 msgid "Load" @@ -5933,10 +5928,10 @@ msgid "Edit Unit Type" msgstr "Editar tipo de unidad" #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:469 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:72 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:71 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:529 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1191 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:535 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:532 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:367 #: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:34 #: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:36 @@ -5979,7 +5974,7 @@ msgstr "el porcentaje debe pertenecer al rango (0,100]" msgid "New Description" msgstr "Descripción nueva" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1132 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1129 msgid "" "resources cost category assignment codes must be unique inside a resource" msgstr "" @@ -6127,7 +6122,7 @@ msgstr " en el directorio especificado." msgid "Autogenerated" msgstr "Autogenerado" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1126 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1123 msgid "criterion satisfaction codes must be unique inside a resource" msgstr "el código del criterio debe ser único dentro de un recurso" @@ -6174,7 +6169,7 @@ msgstr "NavalPlan: Configuración" msgid "Average of the worked hours" msgstr "Media de horas trabajadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:469 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:466 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" @@ -6337,7 +6332,7 @@ msgstr "Vista de carga de recursos" msgid "Hours" msgstr "Horas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:629 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:628 msgid "the date must be inside the visualization area" msgstr "la fecha debe estar dentro del área de visualización" @@ -6379,6 +6374,10 @@ msgstr "el valor máximo no puede ser vacío" msgid "New label" msgstr "Nueva etiqueta" +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:133 +msgid "Worker ID cannot be empty" +msgstr "NIF del trabajador no especificado" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:350 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:346 msgid "The start date cannot be null" @@ -6508,8 +6507,8 @@ msgstr "Lista de materiales para la categoría {0}" msgid "Total price" msgstr "Precio total" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:896 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:902 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:925 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:931 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:381 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:692 #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:179 diff --git a/navalplanner-webapp/src/main/resources/i18n/gl.po b/navalplanner-webapp/src/main/resources/i18n/gl.po index 9860dd243..2aa6d74fc 100644 --- a/navalplanner-webapp/src/main/resources/i18n/gl.po +++ b/navalplanner-webapp/src/main/resources/i18n/gl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-05 11:51+0100\n" +"POT-Creation-Date: 2011-01-07 08:58+0100\n" "PO-Revision-Date: 2011-01-05 12:46+0100\n" "Last-Translator: Manuel Rego Casasnovas \n" "Language-Team: Galician <>\n" @@ -393,7 +393,7 @@ msgstr "NavalPlan: Erro" msgid "Project Name" msgstr "Nome do proxecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:879 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:908 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:303 msgid "Indent" msgstr "Indentar" @@ -454,7 +454,7 @@ msgstr "falta código nunha excepción de calendario" msgid "Current selection" msgstr "Selección actual" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1112 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1109 msgid "" "there exist criterion satisfactions referring to criterion types not " "applicable to this resource" @@ -539,7 +539,7 @@ msgstr "Ubicacións non asignadas" msgid "Application URI" msgstr "URI da aplicación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:418 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:415 msgid "" "The {0} is not valid, criterionType overlaps with other " "criterionSatisfaction from the same criterionType" @@ -719,7 +719,7 @@ msgid "The task code cannot be null" msgstr "O código da tarefa non pode ser nulo" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:275 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:643 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:640 #: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:35 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:46 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:45 @@ -789,7 +789,7 @@ msgstr "Xuño" msgid "{0} annotation required on {1}" msgstr "{0} anotación obrigatoria en {1}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:979 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:1008 msgid "Modified" msgstr "Modificado" @@ -829,6 +829,10 @@ msgstr "Código da tarefa" msgid "Ending date" msgstr "Data de fin" +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:75 +msgid "Show all progress" +msgstr "Mostrar todo o progreso" + #: navalplanner-webapp/src/main/webapp/templates/_list.zul:20 msgid "Templates List" msgstr "Lista de modelos" @@ -993,7 +997,7 @@ msgstr "Proxecto do cliente" msgid "Progress Types List" msgstr "Lista de tipos de progreso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:415 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:412 msgid "" "The {0} can not be assigned to this resource. Its interval overlaps with " "other criterion" @@ -1186,11 +1190,11 @@ msgstr "Listado de perfís" msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "{0} da categoría {1} e {2} da categoría {3} teñen o mesmo código" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:850 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:216 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:853 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:215 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:277 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:854 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:630 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:627 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:67 #: navalplanner-webapp/src/main/webapp/templates/templates.zul:63 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 @@ -1220,7 +1224,7 @@ msgid "Filter by task status" msgstr "Filtrar por estado da tarefa" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:471 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:423 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:422 msgid "Select date:" msgstr "Seleccione data:" @@ -1330,16 +1334,16 @@ msgstr "data non especificada" msgid "Select type :" msgstr "Seleccione tipo :" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:73 -msgid "Shrink to fit page width" -msgstr "Reducir para axustar ao ancho de páxina" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:258 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:268 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:238 msgid "Projects Planning" msgstr "Planificación de proxectos" +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:73 +msgid "Shrink to fit page width" +msgstr "Reducir para axustar ao ancho de páxina" + #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:66 msgid "Last name" msgstr "Apelidos" @@ -1486,7 +1490,7 @@ msgstr "" "Data de fin estimada para a tarefa (presione enter no cadro de texto para " "abrir o calendario ou escriba a data directamente)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:342 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:341 msgid "Expand/Collapse all" msgstr "Expandir/Pregar todo" @@ -1494,11 +1498,11 @@ msgstr "Expandir/Pregar todo" msgid "Overload due to current project" msgstr "Sobrecarga debido ao proxecto actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:840 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:841 msgid "Name: {0}" msgstr "Nome: {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:815 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:844 msgid "Move down" msgstr "Mover abaixo" @@ -1625,7 +1629,7 @@ msgstr "Seleccionar o calendario pai" msgid "There is no task with this code" msgstr "Non hai ningunha tarefa con este código" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:297 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:292 msgid "criterion satisfaction with end date less than start date" msgstr "o criterio satisfeito ten data de fin anterior á de inicio" @@ -1842,7 +1846,7 @@ msgstr "Etiqueta" msgid "Create Scenario" msgstr "Crear Escenario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:782 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:811 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" @@ -1934,6 +1938,11 @@ msgstr "Semana de traballo" msgid "You will lose the changes. Are you sure?" msgstr "Perderanse os cambios. ¿Está seguro?" +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:26 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:45 +msgid "Company ID" +msgstr "NIF" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:184 msgid "Unit type name cannot be empty" msgstr "O nome do tipo de unidade non pode ser baleiro" @@ -2024,7 +2033,7 @@ msgstr "Crear tipo de parte de traballo" msgid "Criterion requirement" msgstr "Criterios requiridos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:212 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:211 msgid "" "Still not saved changes would be lost. Are you sure you want to go to create " "a template?" @@ -2162,6 +2171,13 @@ msgstr "Sobreasignable" msgid "format filters are not valid" msgstr "o formato dos filtros non é válido" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:52 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:71 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28 +msgid "ID" +msgstr "NIF" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:341 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:178 msgid "The init date cannot be empty" @@ -2221,7 +2237,7 @@ msgstr "Grupo de horas" msgid "Unallocated name" msgstr "Nome no asignado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:836 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:865 msgid "Move up" msgstr "Mover arriba" @@ -2265,7 +2281,7 @@ msgstr "Crear novo proxecto" msgid "Work done from starting date:" msgstr "Traballo realizado desde a data de inicio:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:847 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:849 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 #: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:42 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:44 @@ -2304,6 +2320,13 @@ msgstr "falta a data nunha excepción de calendario" msgid "Exception" msgstr "Excepción" +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:107 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:179 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:449 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:514 +msgid "There is no resource with this ID" +msgstr "Non hai un recurso con este NIF" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:191 #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:194 msgid "Send" @@ -2594,14 +2617,14 @@ msgstr "NavalPlan: Calendarios" msgid "{0} not found type for criterion " msgstr "{0} non atopado tipo para criterio " -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:67 -msgid "Page down" -msgstr "Páxina abaixo" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:394 msgid "Hours cannot be null" msgstr "As horas non poden ser nulas" +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:67 +msgid "Page down" +msgstr "Páxina abaixo" + #: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:469 msgid "resource type does not allow enabled criteria" msgstr "o tipo de recurso non permite criterios habilitados" @@ -2707,13 +2730,6 @@ msgstr "A data do tramo debe ser maior ou igual cá data de inicio da tarefa" msgid "Task Properties" msgstr "Propiedades da tarefa" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:107 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:179 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:449 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:514 -msgid "There is no resource with this ID" -msgstr "Non hai un recurso con este NIF" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:172 msgid "Cost category saved" msgstr "Categoría de coste gardada" @@ -2743,7 +2759,7 @@ msgstr "Borrar tarefa seleccionada" msgid "{0} (max: {1})" msgstr "{0} (máx: {1})" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:522 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:519 msgid "end" msgstr "fin" @@ -2911,8 +2927,8 @@ msgstr "o nome non pode ser baleiro" msgid "Disabled" msgstr "Deshabilitado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:597 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:350 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:596 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:349 msgid "Earned value" msgstr "Valor gañado" @@ -2924,8 +2940,8 @@ msgstr "Editar tipo de horas de traballo" msgid "From Today" msgstr "A partir de hoxe" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1041 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1056 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1044 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1059 msgid "{0} not supported yet" msgstr "{0} aínda non soportado" @@ -3040,8 +3056,8 @@ msgstr "Nome do rol" msgid "This worker was already removed by other user" msgstr "Este traballador xa foi borrado por outro usuario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:677 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:476 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:676 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:475 msgid "h" msgstr "h" @@ -3077,7 +3093,7 @@ msgstr "Engadir fito" msgid "Assign selected items" msgstr "Asignar elementos seleccionados" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:501 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:498 msgid "init" msgstr "inicio" @@ -3401,10 +3417,6 @@ msgstr "Inesperado: {0}" msgid " {0}s" msgstr " {0}s" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:133 -msgid "Worker ID cannot be empty" -msgstr "NIF do traballador non especificado" - #: navalplanner-webapp/src/main/webapp/planner/main.zul:60 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:49 msgid "Notes" @@ -3645,6 +3657,10 @@ msgstr "acabar non despois de" msgid "Work Hours" msgstr "Horas de traballo" +#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:163 +msgid "Company ID already used. It has to be be unique" +msgstr "NIF da empresa xa está sendo usado. Debe ser único" + #: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:121 msgid "There is no material category with this code" msgstr "Non hai ningunha categoría de materiais con este código" @@ -3669,7 +3685,7 @@ msgstr "Tipo de excepción de calendario non atopado" msgid "Worker must be not-null" msgstr "O traballador non debe ser nulo" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1025 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1022 msgid "Some criterion satisfactions overlap in time" msgstr "Algúns criterios satisfeitos solápanse no tempo" @@ -4068,7 +4084,7 @@ msgstr "Seleccionar orixe" msgid "Total dedication" msgstr "Dedicación total" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:748 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:721 msgid "" "You can not remove the task \"{0}\" because of this or any of its children " "are already in use in some work reports" @@ -4093,7 +4109,7 @@ msgstr "Número de díxitos:" msgid "Subcontratation date" msgstr "Data de subcontratación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:250 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:249 msgid "" "Templates can only be created from already existent tasks.\n" "Newly tasks cannot be used." @@ -4249,7 +4265,7 @@ msgstr "Non foi posible cargar a entidade. Non atopada. Id: " msgid "Create Virtual Workers Group" msgstr "Crear grupo de traballadores virtuais" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:844 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:845 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:843 msgid "Hours invested" msgstr "Horas invertidas" @@ -4271,11 +4287,7 @@ msgstr "tarefa :" msgid "ALL" msgstr "TODOS" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:75 -msgid "Show all progress" -msgstr "Mostrar todo o progreso" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:220 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:214 msgid "criterion satisfaction's resource not specified" msgstr "recurso do criterio satisfeito non especificado" @@ -4328,8 +4340,7 @@ msgstr "Vista da compañía" msgid "NavalPlan: Configuration" msgstr "NavalPlan: Configuración" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:727 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:682 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:733 msgid "Not editable for containing more that an hours group." msgstr "Non editable por conter máis dun grupo de horas." @@ -4404,7 +4415,7 @@ msgstr "Borrar calendario" #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:506 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:138 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1288 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:734 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:707 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1498 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1662 msgid "must be lower than finish date" @@ -4568,7 +4579,7 @@ msgstr "Usuario gardado" msgid "Task quality form name" msgstr "Nombre del formulario de calidad de tarea" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1055 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1052 msgid "Some cost category assignments overlap in time" msgstr "Algunhas asignacións a categorías de coste solápanse no tempo" @@ -4684,7 +4695,7 @@ msgstr "Modo de planificación" msgid "Filter" msgstr "Filtrar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:201 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:200 msgid "Choose a task to operate on it" msgstr "Seleccione unha tarefa para operar sobre ela" @@ -4758,7 +4769,7 @@ msgstr "Administración" #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:580 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:489 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1271 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:716 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:689 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1481 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1644 msgid "must be greater than start date" @@ -4876,10 +4887,6 @@ msgstr "tan pronto como sexa posible" msgid "The code cannot be empty." msgstr "O código non pode estar baleiro" -#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:163 -msgid "Company ID already used. It has to be be unique" -msgstr "NIF da empresa xa está sendo usado. Debe ser único" - #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:34 msgid "Human hours per machine working hour within configuration unit" msgstr "" @@ -4939,7 +4946,7 @@ msgstr "Asignación de categoría de coste" msgid "missing code in a hour cost" msgstr "falta código nun coste por hora" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:805 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:806 msgid "All workers" msgstr "Todos os traballadores" @@ -5121,10 +5128,10 @@ msgstr "Nome de usuario da nosa empresa" msgid "Filter work reports" msgstr "Filtrar partes de traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:841 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:842 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:274 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:842 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:650 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:647 #: navalplanner-webapp/src/main/webapp/templates/templates.zul:62 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:48 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:45 @@ -5253,7 +5260,7 @@ msgstr "" "consolidado. Débense borrar as consolidacións de todas as súas medidas de " "progreso." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:858 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:887 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:289 msgid "Unindent" msgstr "Desindentar" @@ -5333,7 +5340,7 @@ msgstr "Seleccione as propiedades da páxina de impresión" msgid "NavalPlan: Project Costs Per Resource" msgstr "NavalPlan: Costes de proxectos por recurso" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:211 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:205 msgid "criterion satisfaction's criterion not specified" msgstr "criterio do criterio satisfeito non especificado" @@ -5377,18 +5384,6 @@ msgstr "Gráficas de planificación expandidas" msgid "Not deletable" msgstr "Imborrable" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:71 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:36 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:52 -msgid "ID" -msgstr "NIF" - -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:52 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106 -msgid "Company ID" -msgstr "NIF" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:168 msgid "Doing {0} reassignations" msgstr "Realizando {0} reasignacións" @@ -5416,7 +5411,7 @@ msgstr "" msgid "Criterion Type List" msgstr "Lista de tipos de criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:598 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:597 msgid "Overall progress" msgstr "Progreso global" @@ -5482,7 +5477,7 @@ msgstr "" "Non se pode insertar material na vista xeral. Por favor, seleccione unha " "categoría" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:194 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:192 msgid "criterion satisfaction's start date not specified" msgstr "data de inicio do criterio satisfeito non especificada" @@ -5676,7 +5671,7 @@ msgstr "Data de inicio" msgid "Update exception" msgstr "Actualizar excepción" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:252 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:251 msgid "Operation cannot be done" msgstr "Non se pode realizar a operación" @@ -5772,8 +5767,8 @@ msgstr "Este tipo de etiqueta xa está asignado ao tipo de parte de traballo." msgid "New criterion" msgstr "Criterio novo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:596 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:349 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:595 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:348 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:541 #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:48 msgid "Load" @@ -5913,10 +5908,10 @@ msgid "Edit Unit Type" msgstr "Editar tipo de unidade" #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:469 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:72 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:71 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:529 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1191 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:535 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:532 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:367 #: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:34 #: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:36 @@ -5959,7 +5954,7 @@ msgstr "a porcentaxe debe estar no rango (0,100]" msgid "New Description" msgstr "Nova descrición" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1132 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1129 msgid "" "resources cost category assignment codes must be unique inside a resource" msgstr "" @@ -6105,7 +6100,7 @@ msgstr " no directorio especificado." msgid "Autogenerated" msgstr "Autoxerado" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1126 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1123 msgid "criterion satisfaction codes must be unique inside a resource" msgstr "o código do criterio debe ser único dentro dun recurso" @@ -6152,7 +6147,7 @@ msgstr "NavalPlan: Configuración" msgid "Average of the worked hours" msgstr "Media de horas traballadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:469 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:466 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" @@ -6315,7 +6310,7 @@ msgstr "Vista de carga de recursos" msgid "Hours" msgstr "Horas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:629 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:628 msgid "the date must be inside the visualization area" msgstr "a data debe estar dentro da área de visualización" @@ -6357,6 +6352,10 @@ msgstr "O valor máximo non pode ser baleiro" msgid "New label" msgstr "Nova etiqueta" +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:133 +msgid "Worker ID cannot be empty" +msgstr "NIF do traballador non especificado" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:350 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:346 msgid "The start date cannot be null" @@ -6486,8 +6485,8 @@ msgstr "Lista de materiais para a categoría: {0}" msgid "Total price" msgstr "Prezo total" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:896 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:902 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:925 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:931 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:381 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:692 #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:179 diff --git a/navalplanner-webapp/src/main/resources/i18n/keys.pot b/navalplanner-webapp/src/main/resources/i18n/keys.pot index f330aec86..cebf4bee5 100644 --- a/navalplanner-webapp/src/main/resources/i18n/keys.pot +++ b/navalplanner-webapp/src/main/resources/i18n/keys.pot @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.9.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-05 11:51+0100\n" +"POT-Creation-Date: 2011-01-07 08:58+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -388,7 +388,7 @@ msgstr "" msgid "Project Name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:879 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:908 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:303 msgid "Indent" msgstr "" @@ -447,7 +447,7 @@ msgstr "" msgid "Current selection" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1112 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1109 msgid "" "there exist criterion satisfactions referring to criterion types not " "applicable to this resource" @@ -527,7 +527,7 @@ msgstr "" msgid "Application URI" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:418 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:415 msgid "" "The {0} is not valid, criterionType overlaps with other " "criterionSatisfaction from the same criterionType" @@ -699,7 +699,7 @@ msgid "The task code cannot be null" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:275 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:643 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:640 #: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:35 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:46 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:45 @@ -768,7 +768,7 @@ msgstr "" msgid "{0} annotation required on {1}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:979 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:1008 msgid "Modified" msgstr "" @@ -806,6 +806,10 @@ msgstr "" msgid "Ending date" msgstr "" +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:75 +msgid "Show all progress" +msgstr "" + #: navalplanner-webapp/src/main/webapp/templates/_list.zul:20 msgid "Templates List" msgstr "" @@ -966,7 +970,7 @@ msgstr "" msgid "Progress Types List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:415 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:412 msgid "" "The {0} can not be assigned to this resource. Its interval overlaps with " "other criterion" @@ -1157,11 +1161,11 @@ msgstr "" msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:850 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:216 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:853 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:215 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:277 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:854 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:630 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:627 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:67 #: navalplanner-webapp/src/main/webapp/templates/templates.zul:63 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 @@ -1191,7 +1195,7 @@ msgid "Filter by task status" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:471 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:423 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:422 msgid "Select date:" msgstr "" @@ -1301,16 +1305,16 @@ msgstr "" msgid "Select type :" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:73 -msgid "Shrink to fit page width" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:258 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:268 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:238 msgid "Projects Planning" msgstr "" +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:73 +msgid "Shrink to fit page width" +msgstr "" + #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:66 msgid "Last name" msgstr "" @@ -1453,7 +1457,7 @@ msgid "" "popup or type in date directly)" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:342 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:341 msgid "Expand/Collapse all" msgstr "" @@ -1461,11 +1465,11 @@ msgstr "" msgid "Overload due to current project" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:840 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:841 msgid "Name: {0}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:815 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:844 msgid "Move down" msgstr "" @@ -1590,7 +1594,7 @@ msgstr "" msgid "There is no task with this code" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:297 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:292 msgid "criterion satisfaction with end date less than start date" msgstr "" @@ -1805,7 +1809,7 @@ msgstr "" msgid "Create Scenario" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:782 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:811 msgid "Value is not valid, taking into account the current list of HoursGroup" msgstr "" @@ -1895,6 +1899,11 @@ msgstr "" msgid "You will lose the changes. Are you sure?" msgstr "" +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:26 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:45 +msgid "Company ID" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:184 msgid "Unit type name cannot be empty" msgstr "" @@ -1985,7 +1994,7 @@ msgstr "" msgid "Criterion requirement" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:212 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:211 msgid "" "Still not saved changes would be lost. Are you sure you want to go to create " "a template?" @@ -2121,6 +2130,13 @@ msgstr "" msgid "format filters are not valid" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:52 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:71 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28 +msgid "ID" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:341 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:178 msgid "The init date cannot be empty" @@ -2178,7 +2194,7 @@ msgstr "" msgid "Unallocated name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:836 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:865 msgid "Move up" msgstr "" @@ -2222,7 +2238,7 @@ msgstr "" msgid "Work done from starting date:" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:847 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:849 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 #: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:42 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:44 @@ -2261,6 +2277,13 @@ msgstr "" msgid "Exception" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:107 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:179 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:449 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:514 +msgid "There is no resource with this ID" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:191 #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:194 msgid "Send" @@ -2540,14 +2563,14 @@ msgstr "" msgid "{0} not found type for criterion " msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:67 -msgid "Page down" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:394 msgid "Hours cannot be null" msgstr "" +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:67 +msgid "Page down" +msgstr "" + #: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:469 msgid "resource type does not allow enabled criteria" msgstr "" @@ -2653,13 +2676,6 @@ msgstr "" msgid "Task Properties" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:107 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:179 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:449 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:514 -msgid "There is no resource with this ID" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:172 msgid "Cost category saved" msgstr "" @@ -2688,7 +2704,7 @@ msgstr "" msgid "{0} (max: {1})" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:522 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:519 msgid "end" msgstr "" @@ -2854,8 +2870,8 @@ msgstr "" msgid "Disabled" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:597 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:350 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:596 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:349 msgid "Earned value" msgstr "" @@ -2867,8 +2883,8 @@ msgstr "" msgid "From Today" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1041 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1056 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1044 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1059 msgid "{0} not supported yet" msgstr "" @@ -2983,8 +2999,8 @@ msgstr "" msgid "This worker was already removed by other user" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:677 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:476 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:676 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:475 msgid "h" msgstr "" @@ -3020,7 +3036,7 @@ msgstr "" msgid "Assign selected items" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:501 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:498 msgid "init" msgstr "" @@ -3340,10 +3356,6 @@ msgstr "" msgid " {0}s" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:133 -msgid "Worker ID cannot be empty" -msgstr "" - #: navalplanner-webapp/src/main/webapp/planner/main.zul:60 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:49 msgid "Notes" @@ -3584,6 +3596,10 @@ msgstr "" msgid "Work Hours" msgstr "" +#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:163 +msgid "Company ID already used. It has to be be unique" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:121 msgid "There is no material category with this code" msgstr "" @@ -3608,7 +3624,7 @@ msgstr "" msgid "Worker must be not-null" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1025 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1022 msgid "Some criterion satisfactions overlap in time" msgstr "" @@ -3996,7 +4012,7 @@ msgstr "" msgid "Total dedication" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:748 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:721 msgid "" "You can not remove the task \"{0}\" because of this or any of its children " "are already in use in some work reports" @@ -4019,7 +4035,7 @@ msgstr "" msgid "Subcontratation date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:250 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:249 msgid "" "Templates can only be created from already existent tasks.\n" "Newly tasks cannot be used." @@ -4171,7 +4187,7 @@ msgstr "" msgid "Create Virtual Workers Group" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:844 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:845 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:843 msgid "Hours invested" msgstr "" @@ -4193,11 +4209,7 @@ msgstr "" msgid "ALL" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:75 -msgid "Show all progress" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:220 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:214 msgid "criterion satisfaction's resource not specified" msgstr "" @@ -4250,8 +4262,7 @@ msgstr "" msgid "NavalPlan: Configuration" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:727 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:682 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:733 msgid "Not editable for containing more that an hours group." msgstr "" @@ -4324,7 +4335,7 @@ msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:506 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:138 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1288 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:734 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:707 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1498 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1662 msgid "must be lower than finish date" @@ -4482,7 +4493,7 @@ msgstr "" msgid "Task quality form name" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1055 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1052 msgid "Some cost category assignments overlap in time" msgstr "" @@ -4598,7 +4609,7 @@ msgstr "" msgid "Filter" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:201 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:200 msgid "Choose a task to operate on it" msgstr "" @@ -4672,7 +4683,7 @@ msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:580 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:489 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1271 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:716 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:689 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1481 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1644 msgid "must be greater than start date" @@ -4789,10 +4800,6 @@ msgstr "" msgid "The code cannot be empty." msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:163 -msgid "Company ID already used. It has to be be unique" -msgstr "" - #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:34 msgid "Human hours per machine working hour within configuration unit" msgstr "" @@ -4848,7 +4855,7 @@ msgstr "" msgid "missing code in a hour cost" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:805 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:806 msgid "All workers" msgstr "" @@ -5027,10 +5034,10 @@ msgstr "" msgid "Filter work reports" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:841 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:842 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:274 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:842 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:650 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:647 #: navalplanner-webapp/src/main/webapp/templates/templates.zul:62 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:48 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:45 @@ -5150,7 +5157,7 @@ msgid "" "progress. It is needed to remove the consolidation on all its progress." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:858 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:887 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:289 msgid "Unindent" msgstr "" @@ -5228,7 +5235,7 @@ msgstr "" msgid "NavalPlan: Project Costs Per Resource" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:211 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:205 msgid "criterion satisfaction's criterion not specified" msgstr "" @@ -5270,18 +5277,6 @@ msgstr "" msgid "Not deletable" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:71 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:36 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:52 -msgid "ID" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:26 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:45 -msgid "Company ID" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:168 msgid "Doing {0} reassignations" msgstr "" @@ -5307,7 +5302,7 @@ msgstr "" msgid "Criterion Type List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:598 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:597 msgid "Overall progress" msgstr "" @@ -5371,7 +5366,7 @@ msgstr "" msgid "Cannot insert material in general view. Please, select a category" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:194 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:192 msgid "criterion satisfaction's start date not specified" msgstr "" @@ -5560,7 +5555,7 @@ msgstr "" msgid "Update exception" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:252 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:251 msgid "Operation cannot be done" msgstr "" @@ -5654,8 +5649,8 @@ msgstr "" msgid "New criterion" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:596 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:349 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:595 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:348 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:541 #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:48 msgid "Load" @@ -5795,10 +5790,10 @@ msgid "Edit Unit Type" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:469 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:72 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:71 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:529 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1191 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:535 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:532 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:367 #: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:34 #: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:36 @@ -5841,7 +5836,7 @@ msgstr "" msgid "New Description" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1132 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1129 msgid "" "resources cost category assignment codes must be unique inside a resource" msgstr "" @@ -5979,7 +5974,7 @@ msgstr "" msgid "Autogenerated" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1126 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1123 msgid "criterion satisfaction codes must be unique inside a resource" msgstr "" @@ -6026,7 +6021,7 @@ msgstr "" msgid "Average of the worked hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:469 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:466 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" @@ -6184,7 +6179,7 @@ msgstr "" msgid "Hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:629 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:628 msgid "the date must be inside the visualization area" msgstr "" @@ -6226,6 +6221,10 @@ msgstr "" msgid "New label" msgstr "" +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:133 +msgid "Worker ID cannot be empty" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:350 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:346 msgid "The start date cannot be null" @@ -6352,8 +6351,8 @@ msgstr "" msgid "Total price" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:896 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:902 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:925 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:931 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:381 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:692 #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:179