From b9c04d5d90206f30e4b59665bff7351a41b4566f Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Tue, 7 Sep 2010 11:40:13 +0200 Subject: [PATCH] Localize predefined criterion types Adds new component suited to localized strings that come from properties from business objets --- .../entities/PredefinedCriterionTypes.java | 16 +- .../web/common/components/L10n.java | 49 + .../src/main/resources/i18n/es.po | 4467 ++++++++++------- .../src/main/resources/i18n/gl.po | 4461 +++++++++------- .../src/main/resources/i18n/keys.pot | 4004 ++++++++------- .../main/resources/metainfo/zk/lang-addon.xml | 6 + .../webapp/resources/criterions/_list.zul | 4 +- 7 files changed, 7257 insertions(+), 5750 deletions(-) create mode 100644 navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/L10n.java diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java index 1ca8df1b4..23d2f46c7 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java @@ -22,6 +22,8 @@ package org.navalplanner.business.resources.entities; import java.util.Arrays; import java.util.List; +import static org.navalplanner.business.i18n.I18nHelper._; + /** * This class defines some criterion types known a priori
* @author Óscar González Fernández @@ -29,37 +31,37 @@ import java.util.List; */ public enum PredefinedCriterionTypes implements ICriterionType { - WORK_RELATIONSHIP("Relationship of the resource with the enterprise ",false, false,true, ResourceEnum.WORKER) { + WORK_RELATIONSHIP(_("WORK_RELATIONSHIP"), "Relationship of the resource with the enterprise ",false, false,true, ResourceEnum.WORKER) { @Override public List getPredefined() { return WorkingRelationship.getCriterionNames(); } }, - LOCATION_GROUP("Location where the resource work",false, true, true, ResourceEnum.RESOURCE) { + LOCATION_GROUP(_("LOCATION_GROUP"), "Location where the resource work",false, true, true, ResourceEnum.RESOURCE) { @Override public List getPredefined() { return Arrays.asList(); } }, - LEAVE("Leave",false, false, true, ResourceEnum.WORKER) { + LEAVE(_("LEAVE"), "Leave",false, false, true, ResourceEnum.WORKER) { @Override public List getPredefined() { return LeaveCriterions.getCriterionNames(); } }, - TRAINING("Training courses and labor training",true, true, true, ResourceEnum.WORKER) { + TRAINING(_("TRAINING"), "Training courses and labor training",true, true, true, ResourceEnum.WORKER) { @Override public List getPredefined() { return Arrays.asList(); } }, - JOB("Job",true, true, true, ResourceEnum.WORKER) { + JOB(_("JOB"),"Job",true, true, true, ResourceEnum.WORKER) { @Override public List getPredefined() { return Arrays.asList(); } }, - CATEGORY("Professional category",true, true, true, ResourceEnum.WORKER) { + CATEGORY(_("CATEGORY"),"Professional category",true, true, true, ResourceEnum.WORKER) { @Override public List getPredefined() { return Arrays.asList(); @@ -76,7 +78,7 @@ public enum PredefinedCriterionTypes implements ICriterionType { private final ResourceEnum resource; - private PredefinedCriterionTypes(String description, boolean allowHierarchy, + private PredefinedCriterionTypes(String name, String description, boolean allowHierarchy, boolean allowSimultaneousCriterionsPerResource, boolean enabled, ResourceEnum resource) { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/L10n.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/L10n.java new file mode 100644 index 000000000..0c51ec7b6 --- /dev/null +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/L10n.java @@ -0,0 +1,49 @@ +/* + * This file is part of NavalPlan + * + * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e + * Desenvolvemento Tecnolóxico de Galicia + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package org.navalplanner.web.common.components; + +import org.navalplanner.web.I18nHelper; +import org.zkoss.zul.Label; + +/** + * This component is aimed to localize strings that come from business objects. For instance: + * + * + * + * + * + * + * + * @author Diego Pino García + */ +@SuppressWarnings("serial") +public class L10n extends Label { + + public L10n() { + + } + + @Override + public void setValue(String value) { + super.setValue(I18nHelper._(value)); + } + +} diff --git a/navalplanner-webapp/src/main/resources/i18n/es.po b/navalplanner-webapp/src/main/resources/i18n/es.po index f283c970b..91fa737ad 100644 --- a/navalplanner-webapp/src/main/resources/i18n/es.po +++ b/navalplanner-webapp/src/main/resources/i18n/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-23 11:47+0200\n" +"POT-Creation-Date: 2010-09-07 11:57+0200\n" "PO-Revision-Date: 2010-06-23 12:34+0200\n" "Last-Translator: Jacobo Aragunde Pérez \n" "Language-Team: Spanish <>\n" @@ -17,96 +17,121 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:336 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:106 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:116 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:140 + +msgid "This order has already been added." +msgstr "La categoría de coste ya había sido borrada." + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:343 msgid "The resource cannot be null" msgstr "El recurso no puede ser nulo" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:386 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:403 msgid "criterion codes must be unique inside a criterion type" msgstr "el código del criterio debe ser único dentro de un tipo de criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:93 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:95 msgid "No authorizations were added because you did not select any." msgstr "No se pueden añadir autorizaciones porque no se seleccionó ninguna." -#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:63 -#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:73 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 + +msgid "Order Name" +msgstr "Pedido guardado" + +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:69 +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:79 msgid "en" msgstr "es" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:130 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:129 msgid "Create exception" msgstr "Crear excepción" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:356 +msgid "Up to company view" +msgstr "Arriba a la vista de la compañía" + #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:45 msgid "Select report data" msgstr "Seleccione fecha del informe" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:351 -msgid "Up to company view" -msgstr "Arriba a la vista de la compañía" +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:206 +msgid "there exist multiple resource calendars with name {0}" +msgstr "existen múltiples calendarios de recursos con el nombre {0}" #: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:58 msgid "Create Virtual Worker" msgstr "Crear trabajador virtual" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:205 -msgid "there exist multiple resource calendars with name {0}" -msgstr "existen múltiples calendarios de recursos con el nombre {0}" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:765 #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:97 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:124 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:148 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:782 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:136 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:69 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:138 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:27 #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:25 #: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:23 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:27 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30 -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:21 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:17 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:25 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:45 #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:37 -#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:28 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:65 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:91 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:75 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:27 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:69 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:136 -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:38 -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:37 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:123 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:165 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:210 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:33 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:100 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:51 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:130 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:38 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:39 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:112 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:153 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:122 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:127 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:101 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:142 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:101 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:97 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:139 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:180 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:128 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:152 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 +#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:28 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:61 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:87 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:36 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:48 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:66 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:36 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:55 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49 #: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:55 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:51 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:112 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:39 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:80 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:124 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:166 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:211 -#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:27 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:75 msgid "Operations" msgstr "Operaciones" @@ -114,20 +139,22 @@ msgstr "Operaciones" msgid "New order sequence" msgstr "Nueva secuencia de pedido" -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:7 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:9 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:27 msgid "Add criterion" msgstr "Añadir criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:130 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:498 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:130 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:194 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:149 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:536 msgid "There is no type of work hours with this code" msgstr "No hay un tipo de horas de trabajo con este código" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:123 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:92 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:81 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:103 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:100 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:135 msgid "Select" msgstr "Seleccionar" @@ -135,24 +162,20 @@ msgstr "Seleccionar" msgid "there must be {0} hours instead of {1}" msgstr "debe haber {0} horas en lugar de {1}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:225 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:36 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:1 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:62 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:251 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:1 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:52 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:137 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:49 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:21 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:64 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:33 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:33 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:88 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:49 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:52 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:137 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:21 msgid "Materials" msgstr "Materiales" -#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:21 -msgid "NavalPlan: Virtual workers" -msgstr "NavalPlan: Trabajadores virtuales" - #: navalplanner-webapp/src/main/webapp/common/configuration.zul:108 msgid "Order view" msgstr "Vista de pedido" @@ -169,7 +192,7 @@ msgstr "La descripción no puede ser nula o vacía" msgid "Percentage of consumed budget hours / hours consumed" msgstr "Porcentaje de horas de presupuesto consumidas / horas consumidas" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:78 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:78 msgid "login name not specified" msgstr "nombre de usuario no especificado" @@ -181,25 +204,26 @@ msgstr "Administrar campos y etiquetas" msgid "Please, select a calendar" msgstr "Por favor, seleccione un calendario" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:165 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:161 +msgid "Predefined" +msgstr "Predefinido" + +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:164 msgid "Summary" msgstr "Resumen" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:63 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:252 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:65 msgid "Quality Forms" msgstr "Formularios de calidad" -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28 -#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:161 -msgid "Predefined" -msgstr "Predefinido" - #: navalplanner-webapp/src/main/webapp/common/configuration.zul:122 msgid "Order sequences" msgstr "Secuencias de pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:237 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:263 msgid "Reports" msgstr "Informes" @@ -207,7 +231,7 @@ msgstr "Informes" msgid "Criterion requirements" msgstr "Criterios requeridos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:90 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:92 msgid "START_NOT_EARLIER_THAN" msgstr "COMENZAR_NO_ANTES_DE" @@ -223,15 +247,22 @@ msgstr "" msgid "Dedication chart" msgstr "Gráfico de dedicación" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:630 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:667 msgid "Not the same hours group, impossible to update" msgstr "No es el mismo grupo de horas, imposible actualizar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:349 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:225 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:140 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:154 + +msgid "Resource Usage" +msgstr "Recursos" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:437 msgid "Remove limiting resource element" msgstr "Borrar elemento de recurso limitante" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:20 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:40 msgid "Active period from" msgstr "Período activo desde" @@ -239,11 +270,11 @@ msgstr "Período activo desde" msgid "hours type :" msgstr "tipo de horas :" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:461 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:494 msgid "Unassign" msgstr "Desasignar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:622 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:648 msgid "incorrect initialization of the advance assignment controller." msgstr "inicialización incorrecta del controlador de asignación de avances." @@ -251,6 +282,11 @@ msgstr "inicialización incorrecta del controlador de asignación de avances." msgid "Manual assignment" msgstr "Asignación manual" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:235 + +msgid "Companies" +msgstr "Vista de la compañía" + #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:67 msgid "Quality form items list" msgstr "Lista de elementos del formulario de calidad" @@ -259,12 +295,12 @@ msgstr "Lista de elementos del formulario de calidad" msgid "Name/Code" msgstr "Nombre/Código" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:850 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:890 msgid "Create order" msgstr "Crear pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:196 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:228 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:247 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:215 msgid "" "End date is not valid, the new end date must be later the current end date" msgstr "" @@ -275,17 +311,17 @@ msgstr "" msgid "Select print visualization options" msgstr "Seleccione las opciones de impresión de la visualización" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:742 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:758 msgid "Hour start" msgstr "Hora de inicio" +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:117 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:31 #: navalplanner-webapp/src/main/webapp/planner/main.zul:52 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:97 msgid "Start" msgstr "Comienzo" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:118 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:118 msgid "cost assignment's category not specified" msgstr "categoría de la asignación de coste no especificada" @@ -310,11 +346,17 @@ msgstr "" msgid "Filter quality forms by :" msgstr "Filtrar formularios de calidad por :" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:97 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:98 msgid "changing perspective" msgstr "cambio de perspectiva" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:121 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:242 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:31 + +msgid "Transfer Projects Between Scenarios" +msgstr "Transferir pedidos entre escenarios" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:123 msgid "" "Could not add those authorizations to profile {0} because they were already " "present." @@ -334,13 +376,14 @@ msgstr "NavalPlan: Perfiles" msgid "NavalPlan: Error" msgstr "NavalPlan: Error" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:244 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:41 -msgid "Materials needs at date" -msgstr "Necesidades de materiales en fecha" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:238 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:33 + +msgid "Advance Report" +msgstr "Tipo de avance" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:299 #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:566 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:299 msgid "Indent" msgstr "Indentar" @@ -356,28 +399,28 @@ msgstr "Calendario base \"{0}\" guardado" msgid "Create Order Element" msgstr "Crear elemento de pedido" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31 -msgid "Locations" -msgstr "Ubicaciones" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java:90 msgid "The advanceType cannot be modified" msgstr "El advanceType no puede ser modificado" +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31 +msgid "Locations" +msgstr "Ubicaciones" + #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:70 msgid "New quality form item" msgstr "Nuevo elemento del formulario de calidad" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:201 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:20 -msgid "Templates list" -msgstr "Lista de plantillas" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:49 + +msgid "generic allocation" +msgstr "Asignación de recursos" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:143 msgid "For interpolation at least two stretches are needed" msgstr "Para interpolar se necesitan al menos dos tramos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:718 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:727 msgid "Order Code" msgstr "Código de pedido" @@ -385,7 +428,7 @@ msgstr "Código de pedido" msgid "Login name" msgstr "Nombre de usuario" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:14 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:34 msgid "Current" msgstr "Actual" @@ -393,15 +436,15 @@ msgstr "Actual" msgid "Machine deleted" msgstr "Máquina borrada" -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:76 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:70 msgid "Dependencies" msgstr "Dependencias" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:196 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:185 msgid "missing code in a calendar exception" msgstr "falta código en una excepción de calendario" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1099 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1100 msgid "" "there exist criterion satisfactions referring to criterion types not " "applicable to this resource" @@ -409,29 +452,35 @@ msgstr "" "existen criterios satisfechos que pertenecen a tipos de criterio no " "aplicables a este recurso" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:61 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:49 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:63 #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:49 msgid "Criterion Requirement" msgstr "Criterio requerido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:54 -msgid "Company Scheduling" -msgstr "Planificación de la compañía" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:60 + +msgid "Minutes" +msgstr "Líneas" #: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:131 msgid "You can not remove a scenario with derived scenarios" msgstr "No se puede eliminar un escenario con escenarios derivados" +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:21 + +msgid "Work Report Types" +msgstr "Tipos de partes de trabajo" + #: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:22 msgid "Create new version" msgstr "Crear versión nueva" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:221 msgid "Derived" msgstr "Derivado" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:285 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:297 msgid "a disabled resource has enabled subresources" msgstr "un recurso deshabilitado tiene subrecursos habilitados" @@ -444,8 +493,8 @@ msgstr "Añadir nueva asignación de avance" msgid "Client" msgstr "Cliente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:499 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:110 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:109 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:502 msgid "" "there are no resources for required criteria: {0}. So the generic allocation " "can't be added" @@ -453,13 +502,13 @@ msgstr "" "no hay recursos con los criterios solicitados: {0}. Por tanto, no se puede " "añadir la asignación genérica" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:393 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:428 msgid "work report has not any description value with this field name" msgstr "" "El parte de trabajo no tiene ningún valor de descripción con ese nombre de " "campo" -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java:146 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java:146 msgid "material category name has to be unique. It is already used" msgstr "el nombre de la categoría de materiales debe ser único. Ya está en uso" @@ -471,8 +520,14 @@ msgstr "Horas imputadas" msgid "It is not allowed to consolidate advances." msgstr "No se permite consolidar avances." +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:269 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:41 + +msgid "Project Costs Per Resource" +msgstr "Costes de pedido por recurso" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:413 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:140 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:412 msgid "Confirm deleting this hour cost. Are you sure?" msgstr "Confirmar el borrado de este coste por hora. ¿Está seguro?" @@ -480,8 +535,8 @@ msgstr "Confirmar el borrado de este coste por hora. ¿Está seguro?" msgid "Delete Milestone" msgstr "Borrar hito" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:486 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:737 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:763 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:485 msgid "The order has no scheduled elements" msgstr "El pedido no tiene elementos planificados" @@ -505,47 +560,53 @@ msgstr "" msgid "Configure" msgstr "Configurar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:242 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 -msgid "Scheduling progress per order" -msgstr "Progreso de la planificación por pedido" - -#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:21 -msgid "Unit type list" -msgstr "Lista de tipos de unidades" - -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:56 #: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:56 msgid "First name" msgstr "Nombre" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:228 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:236 msgid "Could not execute print command" msgstr "No se pudo ejecutar el comando de impresión" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:108 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:112 msgid "Complementary text fields" msgstr "Campos de texto complementario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:190 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1161 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:113 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:194 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1173 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:132 #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:282 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:179 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:198 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:691 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:717 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:179 msgid "Confirm deleting {0}. Are you sure?" msgstr "Confirmar el borrado de {0}. ¿Está seguro?" +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:36 + +msgid "Work Reports List" +msgstr "Lista de partes de trabajo" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:248 + +msgid "Accounts" +msgstr "Acciones" + #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:81 msgid "External code" msgstr "Código externo" -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:46 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:96 + +msgid "Limiting" +msgstr "Recurso limitante" + +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:48 msgid "View" msgstr "Ver" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:521 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:524 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" @@ -554,15 +615,18 @@ msgstr "los recursos por día deben ser no vacíos y mayores que cero" msgid "Version" msgstr "Versión" +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:46 + +msgid "Apply filtering to resources satisfying required criteria" +msgstr "" +"Aplicar filtrado a la carga de recursos que satisfacen los criterios " +"requeridos" + #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:98 msgid "Up" msgstr "Arriba" -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:23 -msgid "Edit type of work hour" -msgstr "Editar tipo de horas de trabajo" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:164 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:183 msgid "" "CriterionType is not valid, it overlaps other criterionSatisfaction with the " "same criterionType" @@ -574,14 +638,10 @@ msgstr "" msgid "Types of work hours" msgstr "Tipos de horas de trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:58 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:126 msgid "EAC" msgstr "EAC" -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:21 -msgid "Virtual workers list" -msgstr "Lista de trabajadores virtuales" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:143 msgid "" "Its planning is not in the current scene.\n" @@ -603,22 +663,23 @@ msgstr "Algún tramo tiene valores mayores o iguales que el tramo anterior" msgid "Total hours order element" msgstr "Total de horas del elemento de pedido" -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:16 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 +#: navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul:22 + +msgid "NavalPlan: Cost Categories" +msgstr "NavalPlan: Categorías de coste" + #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:68 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:62 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:39 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:59 msgid "End date" msgstr "Fecha de fin" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:227 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:254 msgid "missing worker code in the work report" msgstr "falta código de trabajador en un parte de trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/advances/AdvanceAssignmentPlanningCommand.java:68 -msgid "Advance assignment" -msgstr "Asignación de avance" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:140 msgid "" "Value is not valid, the default max value must be greater than the precision " @@ -627,11 +688,15 @@ msgstr "" "El valor no es válido, el valor máximo por defecto debe ser mayor que el " "valor de precisión" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/advances/AdvanceAssignmentPlanningCommand.java:68 +msgid "Advance assignment" +msgstr "Asignación de avance" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:507 msgid "Reassigning {0} orders" msgstr "Reasignando {0} pedidos" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:87 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:87 msgid "profile name is already being used by another profile" msgstr "el nombre del perfil ya está siendo usado por otro perfil" @@ -639,64 +704,72 @@ msgstr "el nombre del perfil ya está siendo usado por otro perfil" msgid "E-mail" msgstr "Correo electrónico" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:103 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:109 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:99 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:115 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:111 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:121 msgid "Please, select an order" msgstr "Por favor, seleccione un pedido" -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:21 -msgid "List quality forms" -msgstr "Lista de formularios de calidad" - #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:26 msgid "User data" msgstr "Datos del usuario" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:127 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:135 msgid "Resource / Criteria" msgstr "Recursos / Criterios" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:767 -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:41 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:48 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:15 -msgid "Criteria" -msgstr "Criterios" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:46 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:134 msgid "Order Details" msgstr "Detalles de pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:79 -msgid "AS_SOON_AS_POSSIBLE" -msgstr "TAN_PRONTO_COMO_SEA_POSIBLE" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:256 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:827 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:51 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:45 +msgid "Criteria" +msgstr "Criterios" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:99 msgid "Error setting up creation form." msgstr "Error preparando el formulario de creación." +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:81 +msgid "AS_SOON_AS_POSSIBLE" +msgstr "TAN_PRONTO_COMO_SEA_POSIBLE" + #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:43 msgid "Lines" msgstr "Líneas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:44 -msgid "Orders List" -msgstr "Lista de pedidos" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:189 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:190 msgid "Error on showing warning message removing workReportType: " msgstr "" "Error al mostrar mensaje de advertencia borrando tipo de parte de trabajo: " +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:601 + +msgid "Edit Work Report" +msgstr "Editar parte de trabajo" + +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:21 + +msgid "Quality Forms List" +msgstr "Formularios de calidad" + #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:29 msgid "Personal data" msgstr "Datos personales" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:210 -msgid "Work reports" -msgstr "Partes de trabajo" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:161 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:157 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:183 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:298 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:230 + +msgid "please, select a Criterion" +msgstr "por favor, seleccione un elemento" #: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:41 msgid "Save Order" @@ -710,15 +783,11 @@ msgstr "{0} anotación obligatoria en {1}" msgid "Modified" msgstr "Modificado" -#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:38 -msgid "Edit virtual resource" -msgstr "Editar recurso virtual" - #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:215 msgid "Add Criterion" msgstr "Añadir criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:212 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:210 msgid "Fattened Tree {0}" msgstr "Árbol aplanado {0}" @@ -726,49 +795,53 @@ msgstr "Árbol aplanado {0}" msgid "You can not remove the current scenario" msgstr "No se puede borrar el escenario actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:287 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:69 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:88 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:288 msgid "MessagesContainer is needed" msgstr "Es necesario un MessagesContainer" -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:43 #: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:68 -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:19 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:39 #: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:23 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60 msgid "Ending date" msgstr "Fecha de fin" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:227 -msgid "Manage cost categories" -msgstr "Administrar categorías de coste" +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:20 + +msgid "Templates List" +msgstr "Lista de plantillas" + +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:33 + +msgid "Subcontracted Tasks List" +msgstr "Lista de tareas subcontratadas" #: navalplanner-webapp/src/main/webapp/common/configuration.zul:135 msgid "Last value" msgstr "Último valor" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:198 -msgid "General resource allocation" -msgstr "Asignación de recursos general" - -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:65 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:67 msgid "Statistics log" msgstr "Histórico de estadísticas" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:46 #: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:39 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:46 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:43 msgid "Edit Calendar" msgstr "Editar calendario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:215 -msgid "Work report query" -msgstr "Consulta de partes de trabajo" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:271 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:41 + +msgid "Materials Needs At Date" +msgstr "Necesidades de materiales en fecha" #: navalplanner-webapp/src/main/webapp/common/configuration.zul:54 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:14 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:20 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:40 msgid "Cannot be empty or null" msgstr "No puede ser vacío o nulo" @@ -780,11 +853,16 @@ msgstr "filtrado" msgid "Total Budget" msgstr "Presupuesto total" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:50 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:50 msgid "Hierarchy" msgstr "Jerarquía" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:740 +#: navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:22 + +msgid "NavalPlan: Work Hours" +msgstr "NavalPlan: Parte de trabajo" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:748 msgid "" "This worker cannot be deleted because it has assignments to projects or " "imputed hours" @@ -805,39 +883,43 @@ msgstr "Sobrecarga debido a otras asignaciones" msgid "Time period saved" msgstr "Período de tiempo guardado" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:39 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:167 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:163 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:189 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:304 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:236 + +msgid "This Criterion has already been added." +msgstr "La categoría de coste ya había sido borrada." + +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:40 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:34 msgid "Filter work report by :" msgstr "Filtrar parte de trabajo por :" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:103 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:41 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:231 msgid "Workers" msgstr "Trabajadores" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:49 -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 msgid "Order element code" msgstr "Código del elemento de pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:109 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:323 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:109 msgid "Advance measurements: " msgstr "Medidas de avance: " -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:22 -msgid "NavalPlan: Work report" -msgstr "NavalPlan: Parte de trabajo" - #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:54 msgid "Year" msgstr "Año" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:66 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:66 msgid "profile name not specified" msgstr "nombre del perfil no especificado" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:60 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:61 msgid "Date Start" msgstr "Fecha de inicio" @@ -850,10 +932,10 @@ msgstr "" msgid "From Chosen" msgstr "A partir de elegidos" -#: navalplanner-webapp/src/main/webapp/planner/order.zul:132 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:63 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:34 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:55 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:63 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:92 msgid "Value" msgstr "Valor" @@ -861,26 +943,35 @@ msgstr "Valor" msgid "Hour costs" msgstr "Costes por hora" +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:40 +msgid "Edit Scenario" +msgstr "Editar escenario" + #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:76 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:52 msgid "Add role" msgstr "Añadir rol" -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:40 -msgid "Edit Scenario" -msgstr "Editar escenario" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:489 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:922 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:504 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:926 msgid "Exception end date should be greater or equals than start date" msgstr "" "La fecha de fin de una excepción debe ser mayor o igual que la fecha de " "inicio" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:703 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:742 msgid "Duplicate advance assignment for order element " msgstr "Asignación de avance duplicada para el elemento de pedido " +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:130 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:146 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:119 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:157 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:117 + +msgid "Filter by criterions" +msgstr "Filtrar por criterios" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:402 msgid "" "The {0} can not be assigned to this resource. Its interval overlaps with " @@ -893,11 +984,11 @@ msgstr "" msgid "Work done until ending date:" msgstr "Trabajo realizado hasta la fecha de fin:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:63 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:131 msgid "Schedule Performance Index" msgstr "Índice de rendimiento de la planificación" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:128 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136 msgid "Earlier starting date" msgstr "Fecha de inicio más temprana" @@ -905,40 +996,46 @@ msgstr "Fecha de inicio más temprana" msgid "Type data" msgstr "Datos del tipo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:502 -msgid "Create virtual resource" -msgstr "Crear recurso virtual" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:249 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:224 -msgid "Label types" -msgstr "Tipos de etiqueta" +msgid "Profiles" +msgstr "Perfil guardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:349 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:356 msgid "The order element code cannot be null" msgstr "El código del elemento de pedido no puede ser nulo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:746 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:762 msgid "Hour finish" msgstr "Hora de fin" +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:39 + +msgid "Edit Work Report Type" +msgstr "Tipos de partes de trabajo" + #: navalplanner-webapp/src/main/webapp/common/layout/template.zul:103 msgid "Perspectives" msgstr "Perspectivas" +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:67 +msgid "Workable time" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:239 msgid "missing code in a subcategory" msgstr "falta código en una subcategoría" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:426 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:427 msgid "Confirm deleting this cost category. Are you sure?" msgstr "Confirmar el borrado de esta categoría de coste. ¿Está seguro?" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:30 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:73 +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:64 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:34 msgid "Non limiting resource allocation" msgstr "Asignación de recursos no limitantes" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:189 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:191 msgid "Error removing element: " msgstr "Error al borrar elemento: " @@ -946,8 +1043,8 @@ msgstr "Error al borrar elemento: " msgid "Company name" msgstr "Nombre de la empresa" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:32 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:74 +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:65 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:36 msgid "Limiting resource allocation" msgstr "Asignación de recursos limitantes" @@ -959,13 +1056,13 @@ msgstr "{0}" msgid "Split new assignment" msgstr "Dividir nueva asignación" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:164 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:210 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:163 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:209 msgid "Expiry date" msgstr "Fecha de vencimiento" +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:66 #: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:52 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:58 msgid "Pagination" msgstr "Paginación" @@ -973,19 +1070,30 @@ msgstr "Paginación" msgid "Change scenario" msgstr "Cambiar escenario" -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:42 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:38 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:41 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:71 msgid "Categories" msgstr "Categorías" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:110 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:125 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:143 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:114 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:146 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:120 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:110 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:181 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:128 + +msgid "Project Details" +msgstr "Detalles de pedido" + +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:35 + +msgid "Create Criterion Type" +msgstr "Crear período de activación" + +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:196 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:225 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182 msgid " to go to output directly" msgstr " ir a la salida directamente" @@ -993,23 +1101,19 @@ msgstr " ir a la salida directamente" msgid "Add new hours group" msgstr "Añadir nuevo grupo de horas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:210 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:214 msgid "Criteria: {0} " msgstr "Criterios: {0} " #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:364 -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:62 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:133 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:64 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:93 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:79 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:62 msgid "Percentage" msgstr "Porcentaje" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:222 -msgid "Manage criteria" -msgstr "Gestionar criterios" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:134 msgid "Updated" msgstr "Actualizado" @@ -1027,67 +1131,83 @@ msgstr "Número de dígitos" msgid "Total capability" msgstr "Capacidad total" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:834 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:877 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:508 +msgid "Advance" +msgstr "Avance" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:232 msgid "Problems connecting with client web service" msgstr "Problemas al conectar con el servicio web cliente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:502 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:834 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:774 -msgid "Advance" -msgstr "Avance" - #: navalplanner-webapp/src/main/webapp/common/layout/login.zul:20 msgid "NavalPlan: User access" msgstr "NavalPlan: Acceso de usuarios" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:93 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:122 -msgid "Exception Type" -msgstr "Tipo de excepción" - -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:21 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:21 -msgid "NavalPlan: Subcontracted tasks" -msgstr "NavalPlan: Tareas subcontratadas" - #: navalplanner-webapp/src/main/webapp/materials/materials.zul:21 msgid "NavalPlan: Materials" msgstr "NavalPlan: Materiales" +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:93 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:121 +msgid "Exception Type" +msgstr "Tipo de excepción" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:202 msgid "Advances sent successfully" msgstr "Avances enviados con éxito" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:215 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:512 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:846 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:754 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:60 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:47 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:45 -msgid "Labels" -msgstr "Etiquetas" +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:21 + +msgid "Profiles List" +msgstr "Listado de perfiles" #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:243 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/common/CustomMenuController.java:257 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:216 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:814 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:889 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:518 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:62 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:45 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:67 +msgid "Labels" +msgstr "Etiquetas" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1229 msgid "Calculated advances measurement can not be removed" msgstr "Las medidas de avance calculadas no se pueden borrar" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:254 + +msgid "Data Types" +msgstr "Tipos de unidad" + #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:147 msgid "Total hours" msgstr "Total de horas" -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:66 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:74 + +msgid "Create Work Hours Type" +msgstr "Crear nuevo tipo de parte de trabajo" + +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:59 msgid "Filter by task status" msgstr "Filtrar por estado de tarea" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:360 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:21 + +msgid "NavalPlan: Advance Report" +msgstr "NavalPlan: AdvanceTypes" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:406 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:518 msgid "Select date:" msgstr "Seleccione fecha:" @@ -1100,8 +1220,8 @@ msgstr "Usuario integrado" msgid "Value last advance reported" msgstr "Valor último avance notificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:482 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:915 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:497 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:919 msgid "You should select a end date for the exception" msgstr "Debe seleccionar una fecha de fin para la excepción" @@ -1117,53 +1237,59 @@ msgstr "Código de la empresa" msgid "Unknown attribute '{0}' in class {1}" msgstr "Atributo desconocido '{0}' en la clase {1}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:649 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:650 msgid "NON LIMITING RESOURCE" msgstr "RECURSO NO LIMITANTE" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java:96 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java:96 msgid "machine name not specified" msgstr "nombre de la máquina no especificado" +#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:21 + +msgid "NavalPlan: Workers" +msgstr "NavalPlan: Parte de trabajo" + #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:77 msgid "Activation periods" msgstr "Períodos de activación" -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:23 -msgid "Edit cost category" -msgstr "Editar categoría de coste" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:368 msgid "Passed" msgstr "Pasado" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:174 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:87 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:127 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:174 msgid "already assigned" msgstr "ya asignado" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:33 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:33 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:123 msgid "Calendar" msgstr "Calendario" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:84 + +msgid "{0}h" +msgstr "{0}" + #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:30 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:55 msgid "Read" msgstr "Leer" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:205 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:230 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:81 msgid "Resources" msgstr "Recursos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:154 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:152 msgid "Source and destination scenarios should be different" msgstr "Los escenarios de origen y destino deben ser diferentes" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:243 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:241 msgid "CriterionType and its criteria saved" msgstr "CriterionType y sus criterios guardados" @@ -1171,21 +1297,26 @@ msgstr "CriterionType y sus criterios guardados" msgid "scenario" msgstr "escenario" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:42 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:187 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:50 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:49 -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:22 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:9 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:8 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:188 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:28 msgid "to" msgstr "a" -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:43 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:86 + +msgid " {0}m" +msgstr "{0}" + #: navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul:43 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:43 msgid "<<" msgstr "<<" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:106 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:105 msgid "worker's first name not specified" msgstr "nombre del trabajador no especificado" @@ -1193,14 +1324,15 @@ msgstr "nombre del trabajador no especificado" msgid "date not specified" msgstr "fecha no especificada" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:93 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:94 msgid "Select type :" msgstr "Seleccione tipo :" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:59 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:255 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:48 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:45 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:61 #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:43 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:45 msgid "Advances" msgstr "Avances" @@ -1208,11 +1340,23 @@ msgstr "Avances" msgid "Shrink to fit page width" msgstr "Reducir para ajustar al ancho de página" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:224 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:261 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:271 + +msgid "Projects Planning" +msgstr "Listado de perfiles" + #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:66 msgid "Last name" msgstr "Apellidos" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:252 +#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:21 + +msgid "NavalPlan: Virtual Workers Groups" +msgstr "NavalPlan: Trabajadores virtuales" + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:253 msgid "cost category name not specified" msgstr "nombre de la categoría de coste no especificado" @@ -1221,36 +1365,20 @@ msgstr "nombre de la categoría de coste no especificado" msgid "Remove" msgstr "Borrar" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:21 -msgid "NavalPlan: Templates" -msgstr "NavalPlan: Plantillas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:62 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130 msgid "SPI" msgstr "SPI" -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:47 -msgid "Name name" -msgstr "Nombre nombre" - -#: navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul:22 -msgid "NavalPlan: Cost categories" -msgstr "NavalPlan: Categorías de coste" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:163 -msgid "Edit quality form" -msgstr "Editar formulario de calidad" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1343 msgid "Interpolation" msgstr "Interpolación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:310 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:313 msgid "{0} must not be before {1}" msgstr "{0} no debe estar antes de {1}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:220 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:205 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:224 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:239 msgid "" "Start date is not valid, the new start date must be previous the current " "start date" @@ -1258,7 +1386,7 @@ msgstr "" "La fecha de inicio no es válida, la fecha de inicio nueva debe ser anterior " "a la fecha de inicio actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:377 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:376 msgid "the code must be not null or not empty" msgstr "el código no puede ser nulo o vacío" @@ -1266,67 +1394,58 @@ msgstr "el código no puede ser nulo o vacío" msgid "Stretches list" msgstr "Lista de tramos" -#: navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:21 -msgid "NavalPlan: QualityForms" -msgstr "NavalPlan: Formularios de calidad" - -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:51 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:59 msgid "Zoom" msgstr "Zoom" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:506 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:210 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:36 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:40 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:169 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:84 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:146 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:84 #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:47 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:36 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:36 #: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:38 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:91 #: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:40 #: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:39 #: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:91 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100 -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:39 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:123 -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:37 -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:40 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:104 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:146 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:126 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:45 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:40 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:44 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:128 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:36 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:40 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:211 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:169 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:38 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:116 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:135 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:80 #: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:37 #: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:41 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:124 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:40 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:44 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:135 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:80 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:37 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:40 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:104 msgid "Save" msgstr "Guardar" -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:21 -msgid "NavalPlan: AdvanceTypes" -msgstr "NavalPlan: AdvanceTypes" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:795 + +msgid "Sorry, you do not have permissions to access this order" +msgstr "No tiene permisos para editar este pedido" #: navalplanner-webapp/src/main/webapp/common/configuration.zul:87 msgid "Material categories" msgstr "Categorías de materiales" -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39 -msgid "Edit advance type data" -msgstr "Editar datos del tipo de avance" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:131 msgid "Pending update" msgstr "Actualización pendiente" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:59 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:67 msgid "End date:" msgstr "Fecha de fin:" @@ -1343,24 +1462,15 @@ msgstr "" "El valor no es válido, el valor debe ser mayor que el valor de los avances " "anteriores." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:296 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:303 msgid "Order Element code cannot be null" msgstr "El código del elemento de pedido no puede ser nulo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:243 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41 -msgid "Task scheduling status for an order" -msgstr "Estado de las tareas de planificacion de un pedido" - -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:62 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:50 msgid "Users authorization" msgstr "Autorización de usuarios" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:334 -msgid "Assign element to queue manually" -msgstr "Asignar elemento a cola manualmente" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:171 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:172 msgid "Problems connecting with subcontractor web service" msgstr "Problemas conectando con el servicio web subcontratista" @@ -1368,20 +1478,19 @@ msgstr "Problemas conectando con el servicio web subcontratista" msgid "Assigned load" msgstr "Carga asignada" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:68 -msgid "Filter by workers" -msgstr "Filtrar por trabajadores" - #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:106 msgid "End Date" msgstr "Fecha de fin" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:76 +msgid "Filter by workers" +msgstr "Filtrar por trabajadores" + +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:111 msgid "Resources Per Day" msgstr "Recursos por día" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:201 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:167 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:201 msgid "ResourceType must be not-null" msgstr "ResourceType no debe ser nulo" @@ -1401,7 +1510,7 @@ msgstr "Expandir/Plegar todo" msgid "Move down" msgstr "Mover abajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:501 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:507 msgid "Name: {0}" msgstr "Nombre: {0}" @@ -1409,34 +1518,25 @@ msgstr "Nombre: {0}" msgid "Report structure" msgstr "Estructura del parte" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:87 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:87 msgid "password not specified" msgstr "contraseña no especificada" -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:49 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:56 msgid "Yes" msgstr "Sí" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:116 #: navalplanner-webapp/src/main/webapp/templates/templates.zul:57 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:117 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:39 msgid "General data" msgstr "Datos generales" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:57 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 msgid "BAC" msgstr "BAC" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:26 -msgid "Apply filtering to machines satisfying required criteria" -msgstr "" -"Aplicar filtrado a las máquinas que satisfacen los criterios requeridos" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:379 -msgid "Calculate Number of Hours" -msgstr "Calcular número de horas" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1301 msgid "" "This advance measurement can not be in current date, because it is " @@ -1445,11 +1545,15 @@ msgstr "" "Esta medida de avance no puede estar en la fecha actual, porque está " "consolidada. Debe seleccionar otra fecha." +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:384 +msgid "Calculate Number of Hours" +msgstr "Calcular número de horas" + #: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:37 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:179 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:80 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:34 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:139 msgid "Assign" msgstr "Asignar" @@ -1457,17 +1561,38 @@ msgstr "Asignar" msgid "missing code in a criterion" msgstr "falta código en un criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:657 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1057 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:717 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1087 #: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:39 msgid "Create Template" msgstr "Crear plantilla" +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:22 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:22 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:22 + +msgid "NavalPlan: Work Reports" +msgstr "NavalPlan: Parte de trabajo" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:168 msgid "Advance type saved" msgstr "Tipo de avance guardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:601 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:101 + +msgid "Edit Company" +msgstr "Editar máquina" + +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:89 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:78 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:116 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:78 + +msgid "Filter by labels" +msgstr "Filtrar por etiqueta:" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:621 msgid "" "IMPORTANT: Don't forget to communicate to subcontractor that his contract " "has been cancelled" @@ -1475,41 +1600,34 @@ msgstr "" "IMPORTANTE: No olvidar comunicar al subcontratista que su contrato ha sido " "cancelado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:57 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:21 + +msgid "NavalPlan: Hours Worked Per Resource" +msgstr "NavalPlan: Informe de horas trabajadas" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 msgid "Schedule Variance" msgstr "Desviación en planificación" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:414 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:409 msgid "Service does not manage resource of type: {0}" msgstr "El servicio no gestiona recursos del tipo: {0}" -#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:39 -msgid "Edit worker" -msgstr "Editar trabajador" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:187 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:188 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:553 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:591 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:622 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1258 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:533 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:571 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:602 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:57 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:57 msgid "Warning" msgstr "Advertencia" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:34 #: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:34 msgid "Select parent calendar" msgstr "Seleccionar el calendario padre" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:67 -msgid "Hours of day" -msgstr "Horas del día" - -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21 -msgid "NavalPlan: Task scheduling status report" -msgstr "NavalPlan: Informe de estado de planificación" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:297 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:297 msgid "criterion satisfaction with end date less than start date" msgstr "el criterio satisfecho tiene fecha de fin anterior a la de inicio" @@ -1529,13 +1647,14 @@ msgstr "Duración (días)" msgid "Assignment Type" msgstr "Tipo de asignación" -#: navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/resources_use.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/index.zul:21 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:21 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:21 +#: navalplanner-webapp/src/main/webapp/planner/resources_use.zul:21 #: navalplanner-webapp/src/main/webapp/planner/order.zul:21 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:21 +#: navalplanner-webapp/src/main/webapp/planner/index.zul:21 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:21 +#: navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul:21 msgid "NavalPlan: Scheduling" msgstr "NavalPlan: planificación" @@ -1548,26 +1667,32 @@ msgstr "Volver a iniciar sesión" msgid "Error on splitting" msgstr "Error al dividir" -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:20 -msgid "NavalPlan: Unit types" -msgstr "NavalPlan: Tipos de unidades" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:45 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:65 msgid "Node without children" msgstr "Nodo sin hijos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:134 -msgid "Profile saved" -msgstr "Perfil guardado" +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:117 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:201 +msgid "There is no label with this code " +msgstr "No hay elementos de pedido con este código" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:205 msgid "Task: {0} " msgstr "Tarea: {0} " -#: navalplanner-webapp/src/main/webapp/planner/order.zul:72 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:136 +msgid "Profile saved" +msgstr "Perfil guardado" + +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:63 msgid "Task properties" msgstr "Propiedades de la tarea" +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:74 + +msgid "There is no type of work report with this code" +msgstr "No hay un tipo de horas de trabajo con este código" + #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:27 #: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:33 msgid "Surname" @@ -1577,35 +1702,31 @@ msgstr "Apellidos" msgid "You need to select some function to configure" msgstr "Necesita seleccionar alguna función para configurar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:694 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:372 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:155 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:67 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:115 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:48 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:134 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:8 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:44 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:65 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:73 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 -msgid "Date" -msgstr "Fecha" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:362 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:361 msgid "the name must be not null or not empty" msgstr "el nombre no puede ser nulo o vacío" -#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:21 -msgid "NavalPlan: Resources" -msgstr "NavalPlan: Recursos" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:703 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:372 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:156 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:67 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:115 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:65 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:73 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:28 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:94 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:48 +msgid "Date" +msgstr "Fecha" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:532 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:570 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:552 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:590 msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "Los recursos asignados para esta tarea serán borrados. ¿Está seguro?" @@ -1619,13 +1740,13 @@ msgstr "Imputación de líneas de pedido" msgid "Advance assignments" msgstr "Asignaciones de avances" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:336 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:339 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:358 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:355 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:319 msgid "The criterion and its type cannot be null" msgstr "El criterio y su tipo no pueden ser nulos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:211 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" @@ -1633,14 +1754,10 @@ msgstr "El código no es válido. Hay otro tipo de unidad con el mismo código" msgid "( max: {0} )" msgstr "( máx: {0} )" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:204 msgid "Error on removing element: " msgstr "Error al borrar elemento: " -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:33 -msgid "Select queue" -msgstr "Seleccionar cola" - #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:63 msgid "Cannot calculate charts for current data" msgstr "No se pueden calcular gráficos para los datos actuales" @@ -1649,21 +1766,25 @@ msgstr "No se pueden calcular gráficos para los datos actuales" msgid "Found workers" msgstr "Trabajadores encontrados" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:464 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:53 +msgid "Select queue" +msgstr "Seleccionar cola" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:465 msgid "The cost category had already been removed." msgstr "La categoría de coste ya había sido borrada." -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:27 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:47 msgid "Work description" msgstr "Descripción del trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:524 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:556 msgid "Order element {0} : Order is incompatible type with {1}" msgstr "Elemento de pedido {0} : El pedido tiene un tipo incompatible con {1}" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:38 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:43 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:64 msgid "Split assignment" msgstr "Dividir asignación" @@ -1675,32 +1796,29 @@ msgstr "No se puede borrar el escenario por defecto, llamado \"{0}\"" msgid "Down" msgstr "Abajo" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:109 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:124 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:142 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:113 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:145 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:119 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:109 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:195 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:165 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:209 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:184 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:162 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:224 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181 msgid "direct link" msgstr "enlace directo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:928 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:37 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:36 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:931 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:75 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:47 msgid "Label" msgstr "Etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:241 -msgid "Order costs per resource" -msgstr "Costes de pedido por recurso" - #: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:36 msgid "Create Scenario" msgstr "Crear Escenario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:605 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:665 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" @@ -1710,11 +1828,10 @@ msgstr "" msgid "Association with roles" msgstr "Asociación con roles" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:351 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:384 msgid "missing type of work hours in a work report line" msgstr "falta el tipo de horas en una línea del parte de trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:230 #: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:29 msgid "Quality forms" msgstr "Formularios de calidad" @@ -1724,57 +1841,58 @@ msgid "Hours group" msgstr "Grupo de horas" #: navalplanner-webapp/src/main/webapp/templates/_list.zul:29 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:92 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:94 msgid "Days from Beginning to Deadline" msgstr "Días desde el comienzo hasta la fecha límite" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:59 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:127 msgid "Estimate At Completion" msgstr "Estimación de coste total actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:196 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:329 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:197 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:353 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:329 msgid "Delete item. Are you sure?" msgstr "Borrar elemento. ¿Está seguro?" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:219 -msgid "Edit machine" -msgstr "Editar máquina" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:27 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:46 msgid "Indirect" msgstr "Indirecto" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:101 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:101 msgid "cost assignment's start date not specified" msgstr "fecha de inicio de la asignación de coste no especificada" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:48 -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:34 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java:46 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:42 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:34 msgid "Order code" msgstr "Código de pedido" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:95 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:108 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:99 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:105 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:95 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:181 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:197 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:170 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:208 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:167 msgid "Output format:" msgstr "Formato de salida:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:25 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:44 msgid "Direct" msgstr "Directo" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:780 +msgid "Op." +msgstr "" + #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:55 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55 msgid "Reference date:" msgstr "Fecha de referencia:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:407 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:420 msgid "Limiting resource assignation" msgstr "Asignación de recursos limitantes" @@ -1786,25 +1904,20 @@ 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/java/org/navalplanner/web/materials/UnitTypeController.java:162 -msgid "Unit type name cannot be empty" -msgstr "El nombre del tipo de unidad no puede ser vacío" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:199 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:21 msgid "Orders list" msgstr "Lista de pedidos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:208 -msgid "Virtual worker groups" -msgstr "Grupos de trabajadores virtuales" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:183 +msgid "Unit type name cannot be empty" +msgstr "El nombre del tipo de unidad no puede ser vacío" #: navalplanner-webapp/src/main/webapp/templates/_list.zul:27 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:87 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:89 msgid "Delay from beginning (days)" msgstr "Retraso desde el comienzo (en días)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:289 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:296 msgid "Resource cannot be null" msgstr "El recurso no puede ser nulo" @@ -1812,11 +1925,12 @@ msgstr "El recurso no puede ser nulo" msgid "Do you want to delete " msgstr "¿Quiere borrar " +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:511 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:34 msgid "Total Hours" msgstr "Horas totales" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:71 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:127 msgid "All orders" msgstr "Todos los pedidos" @@ -1828,19 +1942,25 @@ msgstr "Confirmar cancelación" msgid "Label list" msgstr "Lista de etiquetas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1169 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:290 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:267 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 + +msgid "Work And Progress Per Task" +msgstr "Progreso de trabajo por tarea" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:421 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:435 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:147 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:420 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:434 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1181 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:290 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:261 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:206 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:699 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:185 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:725 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:187 msgid "Error on showing removing element: " msgstr "Error al mostrar el elemento a borrar: " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:85 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:87 msgid "start not earlier than" msgstr "empezar no antes de" @@ -1850,10 +1970,20 @@ msgstr "empezar no antes de" msgid "Select scenario" msgstr "Seleccionar escenario" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:205 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:137 + +msgid "Create Label Type" +msgstr "Crear tipo de etiqueta" + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:232 msgid "missing work report code in a work report" msgstr "falta código en un parte de trabajo" +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:35 + +msgid "Create Work Report Type" +msgstr "Crear nuevo tipo de parte de trabajo" + #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 msgid "Criterion requirement" msgstr "Criterios requeridos" @@ -1870,7 +2000,6 @@ msgstr "" msgid "PDF" msgstr "PDF" -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75 #: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:45 #: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:47 #: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:69 @@ -1881,37 +2010,33 @@ msgstr "Pedidos" msgid "Type resource assignation" msgstr "Asignación de tipo de recursos" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:318 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:148 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:297 msgid "Scheduling saved" msgstr "Planificación guardada" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:196 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:155 -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:6 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:57 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:26 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:197 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:155 msgid "Add new row" msgstr "Añadir nueva fila" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:468 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:501 msgid "Move" msgstr "Mover" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:222 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:223 msgid "missing code in the resource calendar" msgstr "falta código en un calendario de recursos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:138 -msgid "Could not save new criterion" -msgstr "No se pudo guardar el nuevo criterio" - #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:33 #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:33 msgid "Overload" msgstr "Sobrecarga" +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:66 #: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:29 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:64 msgid "Assignment log" msgstr "Histórico de asignación" @@ -1927,11 +2052,7 @@ msgstr "Carga debido al pedido actual" msgid "Deadline (days since beggining project)" msgstr "Fecha límite (días desde el inicio del proyecto)" -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:38 -msgid "Edit unit type data" -msgstr "Editar datos del tipo de unidad" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:390 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:397 msgid "number of hours is not properly calculated based on clock" msgstr "número de horas no calculado correctamente basado en reloj" @@ -1939,11 +2060,11 @@ msgstr "número de horas no calculado correctamente basado en reloj" msgid "Value is not valid, the type must be not empty" msgstr "El valor no es válido, el tipo no debe ser vacío" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:411 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:428 msgid "criterion type name is already being used" msgstr "el nombre de tipo de criterio está siendo usado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:436 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:453 msgid "Could not get order code, please try again later" msgstr "" "No se pudo obtener código de pedido, por favor inténtelo otra vez luego" @@ -1952,43 +2073,48 @@ msgstr "" msgid "worker" msgstr "trabajador" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:102 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:134 + +msgid "Edit Cost Category" +msgstr "Editar categoría de coste" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:100 msgid "Error setting up creation form for Criterion Type" msgstr "Error preparando el formulario de creación para un tipo de criterio" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:6 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44 -msgid "External company" -msgstr "Empresa externa" - -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:64 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30 #: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:26 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:65 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:43 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:82 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:112 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:26 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:58 #: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:27 msgid "Actions" msgstr "Acciones" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:145 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:26 +msgid "External company" +msgstr "Empresa externa" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:149 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java:72 msgid "New order element" msgstr "Nuevo elemento de pedido" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:75 -msgid "Exceptions" -msgstr "Excepciones" - #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:71 msgid "Start hour" msgstr "Hora de inicio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:847 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:75 +msgid "Exceptions" +msgstr "Excepciones" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:907 msgid "" "You can not remove the order element \"{0}\" because of this or any of its " "children are already in use in some work reports" @@ -1996,19 +2122,18 @@ msgstr "" "No puede borrarse el elemento de pedido \"{0}\" porque uno de sus hijos se " "está usando en algún parte de trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:201 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:225 msgid "format filters are not valid" msgstr "los filtros de formato no son válidos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:496 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:528 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:746 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:781 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:548 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:772 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:495 msgid "You don't have read access to this order" msgstr "No tiene acceso de lectura a este pedido" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:305 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:178 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:304 msgid "The init date cannot be empty" msgstr "La fecha de inicio no puede ser vacía" @@ -2020,19 +2145,20 @@ msgstr "criterio" msgid "Our company password" msgstr "Contraseña de nuestra empresa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:194 -msgid "Create machine" -msgstr "Crear máquina" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:133 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:129 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:155 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:274 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:202 + +msgid "This label has already been added." +msgstr "La categoría de coste ya había sido borrada." #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:46 msgid "A2" msgstr "A2" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:21 -msgid "Criterion type list" -msgstr "Lista de tipos de criterio" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:381 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:380 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_'." @@ -2048,7 +2174,7 @@ msgstr "Confirmar el borrado de esta máquina. ¿Está seguro?" msgid "Hours Group" msgstr "Grupo de horas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:909 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:912 msgid "Unallocated name" msgstr "Nombre no asignado" @@ -2056,22 +2182,24 @@ msgstr "Nombre no asignado" msgid "Move up" msgstr "Mover arriba" -#: navalplanner-webapp/src/main/webapp/planner/order.zul:113 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:120 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:73 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:80 msgid "Advance Consolidation" msgstr "Consolidación de avance" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:55 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:123 msgid "BCWP" msgstr "BCWP" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:42 msgid "Subcontract communication date" msgstr "Fecha de comunicación de la subcontratación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:196 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:259 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:120 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:286 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:268 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:109 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:121 msgid "Scheduling" msgstr "Planificación" @@ -2083,12 +2211,7 @@ msgstr "Las dependencias tienen prioridad" msgid "Nif" msgstr "Nif" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:204 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:31 -msgid "Transfer orders between scenarios" -msgstr "Transferir pedidos entre escenarios" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:58 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:126 msgid "Budget At Completion" msgstr "Total coste planificado" @@ -2096,18 +2219,10 @@ msgstr "Total coste planificado" msgid "Assign Label" msgstr "Asignar etiqueta" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:63 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:71 msgid "Page up" msgstr "Página arriba" -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:21 -msgid "Type of work hours listing" -msgstr "Listado de tipos de horas de trabajo" - -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:21 -msgid "List label types" -msgstr "Listar tipos de etiqueta" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:511 msgid "{0} orders reassignation remaining" msgstr "quedan {0} reasignaciones de pedidos" @@ -2116,13 +2231,14 @@ msgstr "quedan {0} reasignaciones de pedidos" 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:509 -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:20 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:24 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:515 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50 #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:151 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:40 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:151 msgid "State" msgstr "Estado" @@ -2138,17 +2254,23 @@ msgstr "Confirmar cambio" msgid "Single image" msgstr "Imagen simple" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:201 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:102 + +msgid "Edit Profile" +msgstr "Editar perfil" + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:190 msgid "missing date in a calendar exception" msgstr "falta la fecha de una excepción de calendario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:445 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:460 msgid "Exception" msgstr "Excepción" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:226 -msgid "Unit types" -msgstr "Tipos de unidad" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:270 + +msgid "Create new order from template" +msgstr "Crear pedido a partir de plantilla" #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:191 #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:194 @@ -2167,16 +2289,16 @@ msgstr "La contraseña no puede ser vacía para un usuario nuevo" msgid "Type name" msgstr "Nombre del tipo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:155 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:185 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:408 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:181 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:208 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:30 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:13 -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:26 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:407 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:33 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:26 msgid "All" msgstr "Todo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:333 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:421 msgid "Manual" msgstr "Manual" @@ -2184,32 +2306,27 @@ msgstr "Manual" msgid "Calendars List" msgstr "Lista de calendarios" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:183 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:209 msgid "Cannot be higher than Ending date" msgstr "No puede ser mayor que la fecha de fin" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:214 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:213 msgid "Create activation period" msgstr "Crear período de activación" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:10 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:30 msgid "Personal details" msgstr "Detalles personales" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:206 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:21 msgid "Workers List" msgstr "Lista de trabajadores" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:202 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:168 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:202 msgid "Criterion must be not-null" msgstr "El criterio no debe ser nulo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:292 -msgid "Worker" -msgstr "Trabajador" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:399 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:487 msgid "" "Cannot allocate selected element. There is not any queue that matches " "resource allocation criteria at any interval of time" @@ -2218,8 +2335,12 @@ msgstr "" "coincida con los criterios de asignación de recursos en ningún intervalo de " "tiempo" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:254 +msgid "Worker" +msgstr "Trabajador" + #: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:160 -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:206 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:214 msgid "criterion name not specified" msgstr "nombre del criterio no especificado" @@ -2235,7 +2356,7 @@ msgstr "el " msgid "Advance Progress" msgstr "Progreso de avance" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:4 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:24 msgid "Manual allocation" msgstr "Asignación manual" @@ -2244,11 +2365,16 @@ msgid "External overload" msgstr "Sobrecarga externa" #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:32 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:69 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:57 msgid "Authorize" msgstr "Autorizar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:170 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:240 + +msgid "Scenarios" +msgstr "escenario" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:177 msgid "Create order from Template" msgstr "Crear pedido a partir de plantilla" @@ -2260,20 +2386,20 @@ msgstr "Materiales guardados" msgid "Quarter" msgstr "Cuarto" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:699 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:738 msgid "Duplicate value true report global Advance for order element " msgstr "" "Valor verdadero duplicado para la propiedad 'informar avance global' en el " "elemento de pedido " -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:40 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:77 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:25 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:41 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:65 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:111 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:25 msgid "Profile name" msgstr "Nombre del perfil" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:224 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:232 msgid "Could open generated PDF" msgstr "No se pudo abrir el PDF generado" @@ -2281,10 +2407,16 @@ msgstr "No se pudo abrir el PDF generado" msgid "Disable Delete" msgstr "Deshabilitar borrado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:145 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:143 msgid "You should select a source scenario" msgstr "Debe seleccionar un escenario de origen" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:268 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 + +msgid "Estimated/Planned Hours Per Task" +msgstr "Horas estimadas completadas por tarea" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:67 msgid "Assigned" msgstr "Asignado" @@ -2299,40 +2431,48 @@ msgid "" msgstr "" "El nombre no es válido, ya hay otro tipo de avance con el mismo nombre. " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:135 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:137 msgid "Company saved" msgstr "Empresa guardada" #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:234 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:173 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:174 msgid "Error: {0}" msgstr "Error: {0}" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:162 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:161 msgid "Parent" msgstr "Padre" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:68 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:88 msgid "Earliest date" msgstr "Fecha más temprana" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:213 -msgid "Work report list" -msgstr "Lista de partes de trabajo" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:114 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:116 msgid "Type of work hours saved" msgstr "Tipo de horas de trabajo guardado" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:226 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:111 + +msgid "Projects" +msgstr "Perspectivas" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:148 + +msgid "Create Quality Form" +msgstr "Crear formulario de calidad" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java:63 msgid "Not found converter for {0}" msgstr "No se encontró un conversor para {0}" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:69 msgid "Material assignments" msgstr "Asignaciones de materiales" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:96 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:98 msgid "start in fixed date" msgstr "comenzar en fecha fija" @@ -2344,27 +2484,23 @@ msgstr "" "El valor no es válido, el valor de precisión debe ser menor que el valor " "máximo por defecto." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:916 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:919 msgid "Text field" msgstr "Campo de texto" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:194 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:193 msgid "Create new work week" msgstr "Crear nueva semana de trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:137 -msgid "Create label type" -msgstr "Crear tipo de etiqueta" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:648 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:649 msgid "LIMITING RESOURCE" msgstr "RECURSO LIMITANTE" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:82 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:86 msgid "Extended view" msgstr "Vista expandida" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:168 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:189 msgid "" "The meausure name is not valid. There is another unit type with the same " "measure name" @@ -2376,16 +2512,12 @@ msgstr "" msgid "Work record" msgstr "Registro de trabajo" -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:129 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:151 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:149 msgid "Output format" msgstr "Formato de salida" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:174 -msgid "Criterion saved" -msgstr "Criterio guardado" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:115 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:113 msgid "Error setting up edition form." msgstr "Error preparando el formulario de edición." @@ -2397,27 +2529,22 @@ msgstr "Imprimir" msgid "NavalPlan: Calendars" msgstr "NavalPlan: Calendarios" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:59 +#: 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:380 -msgid "Hours cannot be null" -msgstr "Las horas no pueden ser nulas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:167 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:113 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:167 msgid "{0} not found type for criterion " msgstr "{0} no encontrado tipo para criterio " -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:452 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:387 +msgid "Hours cannot be null" +msgstr "Las horas no pueden ser nulas" + +#: /home/dpino/workspace/navalplan/scripts/../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" -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21 -msgid "NavalPlan: Scheduling progress report" -msgstr "NavalPlan: Informe de progreso de planificación" - #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:32 msgid "General user data" msgstr "Datos generales de usuario" @@ -2427,38 +2554,38 @@ msgid "Unschedule" msgstr "Quitar planificación" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:51 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:216 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:38 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:42 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:175 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:48 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:65 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:97 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:41 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:110 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:84 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:77 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:148 #: navalplanner-webapp/src/main/webapp/common/layout/template.zul:89 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:130 -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:40 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:84 -#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:49 -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:78 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:87 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:101 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:156 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:181 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:112 -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:39 -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:43 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:130 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:84 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:77 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:132 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:65 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:97 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:42 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:46 #: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:33 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:132 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:38 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:42 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:217 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:175 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:40 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:139 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:84 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:39 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:43 +#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:78 +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:79 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:61 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:116 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:141 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:40 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:84 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:130 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:110 msgid "Cancel" msgstr "Cancelar" @@ -2476,26 +2603,27 @@ msgstr "Gráfico de horas acumuladas" msgid "Subcontracted task sent successfully" msgstr "Tarea subcontratada enviada con éxito" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:207 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:21 msgid "Machines List" msgstr "Lista de máquinas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:61 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:129 msgid "CPI" msgstr "CPI" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:8 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:9 -#: navalplanner-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:17 -msgid "Units" -msgstr "Unidades" - -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:52 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:53 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:47 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:45 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:52 msgid "Dates" msgstr "Fechas" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:258 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:37 +msgid "Units" +msgstr "Unidades" + #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:39 msgid "Create Calendar" msgstr "Crear Calendario" @@ -2504,7 +2632,7 @@ msgstr "Crear Calendario" msgid "At least one stretch is needed" msgstr "Se necesita al menos un tramo" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:311 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:302 msgid "a day is not valid" msgstr "un día no es válido" @@ -2518,38 +2646,36 @@ msgstr "" msgid "Task Properties" msgstr "Propiedades de la tarea" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:414 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:477 +#: 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:450 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:515 msgid "There is no resource with this nif" msgstr "No hay otro recurso con este nif" -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:12 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:32 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27 msgid "name" msgstr "nombre" -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:35 -msgid "Create new Work Report Type" -msgstr "Crear nuevo tipo de parte de trabajo" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:168 -msgid "Cost category saved" -msgstr "Categoría de coste guardada" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:192 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:225 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:228 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:244 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:211 msgid "" "End date is not valid, the new end date must be greater than the start date" msgstr "" "Fecha de fin inválida, la fecha de fin nueva debe ser posterior a la fecha " "de inicio" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:169 +msgid "Cost category saved" +msgstr "Categoría de coste guardada" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java:118 msgid "{0} (max: {1})" msgstr "{0} (máx: {1})" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:542 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:602 msgid "end" msgstr "fin" @@ -2566,18 +2692,23 @@ msgstr "Autorizaciones" msgid "Continue" msgstr "Continuar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:197 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:216 msgid "Start date cannot be null" msgstr "La fecha de inicio no puede ser nula" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java:49 -msgid "Generic" -msgstr "Genérico" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:236 + +msgid "Subcontracting" +msgstr "Subcontratar" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1138 msgid "Value is not valid, the Precision value must be exact " msgstr "El valor no es válido, el valor de precisión debe ser exacto " +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java:49 +msgid "Generic" +msgstr "Genérico" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java:127 msgid "Order does not exist" msgstr "El pedido no existe" @@ -2597,50 +2728,48 @@ msgstr "Añadir criterio requerido" msgid "Default max value" msgstr "Valor máximo por defecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:372 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionBandboxFinder.java:46 + +msgid "Criterion Name" +msgstr "Nombre del criterio" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:460 msgid "Automatic" msgstr "Automático" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:126 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:134 msgid "Task" msgstr "Tarea" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:233 -msgid "Manage external companies" -msgstr "Administrar empresas externas" - +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:127 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:123 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:149 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:269 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:197 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:84 msgid "please, select a label" msgstr "por favor, seleccione una etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:391 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:396 msgid "Calculate End Date" msgstr "Calcular fecha de fin" -#: navalplanner-webapp/src/main/webapp/labels/labelTypes.zul:20 -msgid "NavalPlan: Label types" -msgstr "NavalPlan: Tipos de etiquetas" - -#: navalplanner-webapp/src/main/webapp/users/users.zul:22 -msgid "NavalPlan: User accounts" -msgstr "NavalPlan: Cuentas de usuario" - #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:106 msgid "Add profile" msgstr "Añadir perfil" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:214 msgid "filter already exists" msgstr "el filtro ya existe" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:233 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:223 msgid "missing code in a calendar data version" msgstr "falta el código en los datos de versión de un calendario" -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:17 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:21 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:37 #: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:26 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:45 msgid "Criterion name" msgstr "Nombre del criterio" @@ -2652,7 +2781,7 @@ msgstr "los valores no son válidos, no deben ser nulos" msgid "Task name" msgstr "Nombre de la tarea" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:127 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:127 msgid "cost assignment's resource not specified" msgstr "recurso de la asignación de coste no especificado" @@ -2668,14 +2797,14 @@ msgstr "Añadir nuevo criterio requerido" msgid "Select the date from which the new version will be valid" msgstr "Seleccione la fecha a partir de la cual la versión nueva será válida" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:123 +msgid "Budgeted Cost Work Performed" +msgstr "Coste presupuestado del trabajo realizado" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1311 msgid "This advance measurement can not be in " msgstr "Esta asignación de avance no puede estar en " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:55 -msgid "Budgeted Cost Work Performed" -msgstr "Coste presupuestado del trabajo realizado" - #: navalplanner-webapp/src/main/webapp/common/configuration.zul:79 msgid "Work report" msgstr "Parte de trabajo" @@ -2684,23 +2813,28 @@ msgstr "Parte de trabajo" msgid "the name must be not empty" msgstr "el nombre no puede ser vacío" -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:90 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:86 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:58 #: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:26 msgid "Disabled" msgstr "Deshabilitado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:287 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:333 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:462 msgid "Earned value" msgstr "Valor ganado" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:82 + +msgid "Edit Work Hours Type" +msgstr "Editar trabajador" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:42 msgid "From Today" msgstr "A partir de hoy" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:671 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:684 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:677 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:690 msgid "{0} not supported yet" msgstr "{0} aún no soportado" @@ -2708,7 +2842,9 @@ msgstr "{0} aún no soportado" msgid "New entry" msgstr "Entrada nueva" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:48 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:104 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:113 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:213 msgid "Resources Load" msgstr "Carga de recursos" @@ -2716,10 +2852,6 @@ msgstr "Carga de recursos" msgid "Overload due to current order" msgstr "Sobrecarga debido al pedido actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:46 -msgid "Overall Resources Load" -msgstr "Carga global de recursos" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:118 msgid "Changes have been canceled" msgstr "Cambios cancelados" @@ -2729,11 +2861,12 @@ msgstr "Cambios cancelados" msgid "Machine saved" msgstr "Máquina guardada" -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:21 -msgid "Advance type list" -msgstr "Lista de tipos de avance" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:126 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:81 +msgid "Create Cost Category" +msgstr "Editar categoría de coste" + +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:101 msgid "Appropriative allocation" msgstr "Asignación apropiativa" @@ -2741,9 +2874,9 @@ msgstr "Asignación apropiativa" msgid "Assigned criterion requirements" msgstr "Criterios requeridos asignados" -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:16 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:12 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:14 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:36 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:34 msgid "Apply filtering to order elements satisfying required criteria" msgstr "" "Aplicar filtrado a los elementos de pedido que satisfacen los criterios " @@ -2758,7 +2891,7 @@ msgstr "Los avances calculados no se pueden modificar" msgid "Max value" msgstr "Valor máximo" -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:51 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:58 msgid "No" msgstr "No" @@ -2771,7 +2904,7 @@ msgstr "Lista de escenarios" msgid "The name is not valid, the name must not be null " msgstr "El nombre no es válido, no debe ser nulo " -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:129 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 msgid "Hours to allocate" msgstr "Horas para asignar" @@ -2784,21 +2917,17 @@ msgstr "Debe seleccionar una categoría" msgid "Spread" msgstr "Propagación" -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21 -msgid "NavalPlan: Working progress report" -msgstr "NavalPlan: Informe de progreso de trabajo" - -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:70 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:90 msgid "Select start date" msgstr "Seleccionar fecha de inicio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:156 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:154 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:750 #: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:187 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:724 msgid "Removed {0}" msgstr "{0} borrado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:728 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:736 msgid "Confirm deleting this worker. Are you sure?" msgstr "Confirmar el borrado de este trabajador. ¿Está seguro?" @@ -2806,7 +2935,7 @@ msgstr "Confirmar el borrado de este trabajador. ¿Está seguro?" msgid "Group name" msgstr "Nombre del grupo" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:63 msgid "Start date:" msgstr "Fecha de inicio:" @@ -2815,24 +2944,29 @@ msgstr "Fecha de inicio:" msgid "Role name" msgstr "Nombre del rol" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:747 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:755 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/company/CompanyPlanningModel.java:411 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:623 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:459 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:610 msgid "h" msgstr "h" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:588 + +msgid "Create Work Report" +msgstr "Crear trabajador" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:114 msgid "Value is not valid, the precision value must not be empty" msgstr "El valor no es válido, el valor de precisión no debe ser vacío" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:344 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:353 msgid "Workable capacity for this period " msgstr "Capacidad de trabajo para este período " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:188 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:190 msgid "Cannot delete profile: it does not exist anymore" msgstr "No se puede borrar el perfil: ya no existe" @@ -2840,38 +2974,44 @@ msgstr "No se puede borrar el perfil: ya no existe" msgid "Unit Types" msgstr "Tipos de unidad" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1263 -msgid "Add new advance measurement" -msgstr "Añadir nueva medida de avance" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:219 + +msgid "Edit Machine" +msgstr "Editar máquina" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java:99 msgid "Add Milestone" msgstr "Añadir hito" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:109 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:117 msgid "Assign selected items" msgstr "Asignar elementos seleccionados" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:520 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:580 msgid "init" msgstr "inicio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:415 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:503 msgid "Select for automatic queuing" msgstr "Seleccione para encolar automáticamente" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:241 + +msgid "Scenarios Management" +msgstr "Administración de horas" + #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:95 msgid "Create & Assign" msgstr "Crear y asignar" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:131 +msgid "Edit User" +msgstr "Editar usuario" + #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:31 msgid "Print layout" msgstr "Salida de impresión" -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:23 -msgid "Edit User" -msgstr "Editar usuario" - #: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:54 msgid "Maximum/minimum of the estimated hours" msgstr "Máximo/mínimo de las horas estimadas" @@ -2885,51 +3025,32 @@ msgid "" "The date is not valid, the date must be unique for this advanced assignment" msgstr "La fecha no es válida, debe ser única para esta asignación de avance" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:107 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:110 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:135 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:95 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:119 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:122 msgid "Consolidated" msgstr "Consolidado" -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:21 -msgid "Profiles listing" -msgstr "Listado de perfiles" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:211 -msgid "Work report types" -msgstr "Tipos de partes de trabajo" - #: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:216 msgid "missing code in a material" msgstr "falta el código en un material" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:239 -msgid "Completed estimated hours" -msgstr "Horas estimadas completadas" - -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:101 msgid "Customer" msgstr "Cliente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:756 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:772 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:74 msgid "Hours type" msgstr "Tipo de horas" #: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:155 -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:191 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:204 msgid "criterion type name not specified" msgstr "nombre del tipo de criterio no especificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:232 -msgid "Manage user accounts" -msgstr "Administrar cuentas de usuario" - -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:23 -msgid "Edit profile" -msgstr "Editar perfil" - #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:219 msgid "Add Exception" msgstr "Añadir excepción" @@ -2940,18 +3061,14 @@ msgstr "Añadir excepción" msgid "cannot be empty" msgstr "no puede ser vacío" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 -msgid "Completed estimated hours per task" -msgstr "Horas estimadas completadas por tarea" - -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:47 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:48 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:47 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:6 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:6 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:26 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:26 msgid "from" msgstr "desde" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:145 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:146 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:105 msgid "Heading Fields" msgstr "Campos de cabecera" @@ -2964,7 +3081,7 @@ msgstr "" "El período de tiempo contiene datos inválidos. La fecha de fin debe ser " "mayor que la de inicio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:209 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:210 msgid "A type must be selected" msgstr "Debe seleccionar un tipo" @@ -2973,24 +3090,98 @@ msgstr "Debe seleccionar un tipo" msgid "Day is not valid" msgstr "El día no es válido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:474 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:907 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:489 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:911 msgid "You should select a start date for the exception" msgstr "Debe seleccionar una fecha de inicio para la excepción" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:60 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:128 msgid "Variance At Completion" msgstr "Desviación al coste final" -#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:64 +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:70 #: navalplanner-webapp/src/main/webapp/common/layout/login.zul:48 msgid "Help" msgstr "Ayuda" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:43 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:63 msgid "Exportation options" msgstr "Opciones de exportación" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:52 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:53 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:52 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ScenarioBandboxFinder.java:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplateFinder.java:51 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:87 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:354 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:499 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:952 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:39 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:51 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:24 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:54 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:106 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:32 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:26 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:37 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:160 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:26 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:78 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:47 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:111 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:152 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:97 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:126 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:166 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:100 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:141 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:98 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:138 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:179 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:98 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:33 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:49 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:40 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:125 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:149 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:26 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:58 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:108 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:68 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:39 +#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:26 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:30 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:49 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:53 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:75 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:27 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:48 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:109 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:40 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:76 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:26 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:25 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:40 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:72 +msgid "Name" +msgstr "Nombre" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:159 msgid "" "Could not save time period. Time period overlaps with another non-compatible " @@ -2999,91 +3190,34 @@ msgstr "" "No se pudo guardar el período de tiempo. El período se solapa con otro " "período de tiempo incompatible" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:87 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ScenarioBandboxFinder.java:47 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java:47 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:53 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplateFinder.java:51 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:52 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:52 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:952 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:354 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:26 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:33 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:49 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:40 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:121 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:145 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:36 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:26 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:23 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:38 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:24 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:24 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:32 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:30 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:51 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:106 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:54 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:34 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:25 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:62 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:26 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:40 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:72 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:25 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:39 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:51 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:73 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:88 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:78 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:54 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:73 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:26 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:76 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:27 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:97 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:48 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:68 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:27 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:108 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:30 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:49 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:53 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:75 -#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:26 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:40 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:76 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:37 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:161 -#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:26 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:39 -msgid "Name" -msgstr "Nombre" - -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:42 #: navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:42 msgid ">>" msgstr ">>" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:61 + +msgid "Seconds" +msgstr "Enviar" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:107 msgid "please, select an item" msgstr "por favor, seleccione un elemento" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:151 -msgid "Day of week" -msgstr "Día de la semana" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:360 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:367 msgid "Time Start cannot be null" msgstr "La hora de inicio no puede ser nula" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:623 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:21 + +msgid "Companies List" +msgstr "Lista de máquinas" + +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:150 +msgid "Day of week" +msgstr "Día de la semana" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:666 msgid "It not could remove the order element " msgstr "No se pudo borrar el elemento de pedido " @@ -3091,29 +3225,27 @@ msgstr "No se pudo borrar el elemento de pedido " msgid "Stretches with Interpolation" msgstr "Tramos con interpolación" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java:143 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:265 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:49 + +msgid "Hours Worked Per Resource" +msgstr "Horas trabajadas por trabajador" + +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java:143 msgid "The end date cannot be before the init date" msgstr "La fecha de fin no puede ser anterior a la fecha de inicio" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationCommand.java:66 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:108 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:68 msgid "Advance consolidation" msgstr "Consolidación de avances" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:143 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:143 msgid "cost assignment with end date less than start date" msgstr "la asignación de coste tiene fecha de fin anterior a la de inicio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1286 -msgid "" -"This advance can not be removed, because it is spread. It is necessary to " -"select another advance as spread." -msgstr "" -"Este avance no se puede eliminar porque es propagado. Es necesario " -"seleccionar otro avance como propagado." - -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:14 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:34 msgid "Category name" msgstr "Nombre de la categoría" @@ -3121,29 +3253,34 @@ msgstr "Nombre de la categoría" msgid "Maximum/minimum of the worked hours" msgstr "Máximo/mínimo de las horas trabajadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:648 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:685 msgid "Not the same material, impossible to update" msgstr "No es el mismo material, imposible actualizar" +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21 + +msgid "NavalPlan: Work And Progress Per Task" +msgstr "NavalPlan: Informe de progreso de trabajo" + #: navalplanner-webapp/src/main/webapp/common/layout/template.zul:55 msgid "Main menu" msgstr "Menú principal" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:135 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:612 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:638 msgid "cannot include an Advance of the same Advance type twice" msgstr "no se puede asignar un avance del mismo tipo dos veces" -#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:37 #: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:42 +#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:37 msgid "Create From Template" msgstr "Crear a partir de plantilla" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:368 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:367 msgid "There exists other workReportType with the same name." msgstr "Ya existe otro tipo de parte de trabajo con el mismo nombre." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:149 #: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:28 msgid "Schedule" msgstr "Planificar" @@ -3152,7 +3289,12 @@ msgstr "Planificar" msgid "Unexpected: {0}" msgstr "Inesperado: {0}" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:89 + +msgid " {0}s" +msgstr "{0}" + +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:127 msgid "worker's NIF not specified" msgstr "NIF del trabajador no especificado" @@ -3168,11 +3310,21 @@ msgstr "" msgid "Notes" msgstr "Notas" +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:22 + +msgid "NavalPlan: Transfer Projects Between Scenarios" +msgstr "Transferir pedidos entre escenarios" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:223 msgid "Connect" msgstr "Conectar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:212 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:20 + +msgid "NavalPlan: Units" +msgstr "NavalPlan: Tipos de unidades" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:216 msgid "Allocation: [{0},{1}]" msgstr "Asignación: [{0},{1}]" @@ -3184,10 +3336,14 @@ msgstr "Código del elemento de pedido" msgid "Changes saved" msgstr "Cambios guardados" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1042 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1072 msgid "See scheduling" msgstr "Ver planificación" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1262 +msgid "Add measure" +msgstr "Añadir medida" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:142 msgid "" "Some order was created during the configuration process, it is impossible to " @@ -3197,49 +3353,56 @@ msgstr "" "actualizar la tabla de secuencia de pedido. Por favor, inténtelo otra vez " "luego" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:234 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:238 msgid "Work report saved" msgstr "Parte de trabajo guardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:607 -msgid "Other orders" -msgstr "Otros pedidos" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:408 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java:52 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:75 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:421 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java:51 +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:66 msgid "Subcontract" msgstr "Subcontratar" -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29 -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26 -msgid "Relationship" -msgstr "Relación" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:632 +msgid "Other orders" +msgstr "Otros pedidos" +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:118 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:36 #: navalplanner-webapp/src/main/webapp/planner/main.zul:56 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:98 msgid "End" msgstr "Fin" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:546 -msgid "There are not any assigned advance to current task" -msgstr "No hay ningún avance asignado a la tarea actual" +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29 +msgid "Relationship" +msgstr "Relación" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1177 msgid "The date is not valid, the date must be not empty" msgstr "La fecha no es válida, no debe ser vacía" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:546 +msgid "There are not any assigned advance to current task" +msgstr "No hay ningún avance asignado a la tarea actual" + #: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:25 msgid "User login name" msgstr "Nombre de usuario" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:427 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:488 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:253 + +msgid "Cost Categories" +msgstr "Categorías" + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:95 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:167 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:463 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:526 msgid "There is no order element with this code" msgstr "No hay elementos de pedido con este código" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:215 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:227 msgid "criterion type not specified" msgstr "tipo de criterio no especificado" @@ -3251,24 +3414,39 @@ msgstr "" "Otro usuario ha modificado los mismos datos, por tanto la operación no se " "puede completar de manera segura." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:142 -msgid "must be not empty" -msgstr "no puede ser vacío" - #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:69 msgid "Show all resource assignments" msgstr "Mostrar todas las asignaciones de recursos" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:26 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:54 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:142 +msgid "must be not empty" +msgstr "no puede ser vacío" + +#: navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:22 + +msgid "NavalPlan: Companies" +msgstr "NavalPlan: Plantillas" + +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:21 + +msgid "Users List" +msgstr "Listado de usuarios" + #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:51 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:54 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:26 msgid "Task quality forms" msgstr "Formularios de calidad de tarea" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:447 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:462 msgid "Not working day" msgstr "Día no laborable" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:28 + +msgid "Cost category" +msgstr "Categoría de coste guardada" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java:73 msgid "Resource allocation" msgstr "Asignación de recursos" @@ -3277,7 +3455,7 @@ msgstr "Asignación de recursos" msgid "please, select a quality form" msgstr "por favor, seleccione un formulario de calidad" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:387 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:386 msgid "Exist other workReportType with the same code." msgstr "Ya existe otro tipo de parte de trabajo con el mismo código." @@ -3289,32 +3467,32 @@ msgstr "Restricción" msgid "Customer reference code" msgstr "Código de referencia del cliente" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:139 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:143 msgid "Add New Label Type Field" msgstr "Añadir nuevo campo de tipo de etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:370 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:377 msgid "Time finish cannot be null" msgstr "La hora de fin no puede ser nula" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:108 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:108 msgid "Customer reference" msgstr "Referencia de cliente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:487 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:497 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:318 #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:145 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:733 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:416 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:549 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:607 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:731 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:764 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:773 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:796 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:443 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:148 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:297 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:529 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:581 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:705 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:738 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:747 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:782 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:733 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:486 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:496 msgid "Information" msgstr "Información" @@ -3322,7 +3500,7 @@ msgstr "Información" msgid "END" msgstr "FIN" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:193 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:194 msgid "Worker saved" msgstr "Trabajador guardado" @@ -3330,23 +3508,29 @@ msgstr "Trabajador guardado" msgid "can not pass until the previous item is passed." msgstr "no se puede pasar mientras el elemento no anterior sea pasado." -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:36 -msgid "Create new advance type" -msgstr "Crear un nuevo tipo de avance" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementModel.java:205 msgid "New hours group " msgstr "Nuevo grupo de horas " -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:79 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:100 +#: navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:21 + +msgid "NavalPlan: Quality Forms" +msgstr "NavalPlan: Formularios de calidad" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:422 +msgid "Assign element to queue manually" +msgstr "Asignar elemento a cola manualmente" + #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:100 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:79 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 msgid "Filter by orders" msgstr "Filtrar por pedidos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:207 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:211 msgid "Resource: {0} " msgstr "Recurso: {0} " @@ -3354,6 +3538,16 @@ msgstr "Recurso: {0} " msgid "percentage cannot be duplicated" msgstr "el porcentaje no puede estar duplicado" +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:53 + +msgid "Edit Template" +msgstr "Editar plantilla" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:259 + +msgid "Work Hours" +msgstr "Partes de trabajo" + #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:26 msgid "Heading" msgstr "Cabecera" @@ -3370,7 +3564,7 @@ msgstr "No se pudo guardar la máquina" msgid "Unable to convert value to {0} type" msgstr "No se pudo convertir el valor a tipo {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:341 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:334 msgid "The calendar exception type not found" msgstr "Tipo de excepción de calendario no encontrado" @@ -3378,12 +3572,12 @@ 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:1014 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1015 msgid "Some criterion satisfactions overlap in time" msgstr "Algunos criterios satisfechos se solapan en el tiempo" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:593 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:529 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:551 msgid "New order version" msgstr "Nueva versión de pedido" @@ -3391,36 +3585,35 @@ msgstr "Nueva versión de pedido" msgid "Worker assignments" msgstr "Asignaciones de trabajador" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:133 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:487 #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:149 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:115 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:142 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:308 #: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:220 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:389 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:411 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:476 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:980 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:115 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:142 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:308 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:979 #, java-format msgid "{0} already exists" msgstr "{0} ya existe" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:272 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:273 msgid "Create Worker" msgstr "Crear trabajador" -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:17 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:37 msgid "Code " msgstr "Código" -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:52 -msgid "Password confirmation" -msgstr "Confirmación de contraseña" - #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:41 msgid "Paper size" msgstr "Tamaño del papel" +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:52 +msgid "Password confirmation" +msgstr "Confirmación de contraseña" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1266 msgid "None" msgstr "Ninguno" @@ -3433,18 +3626,18 @@ msgstr "Parte de trabajo" msgid "Work" msgstr "Trabajo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:119 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:406 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:494 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:402 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:119 #: navalplanner-webapp/src/main/webapp/common/event_error.zul:21 msgid "Error" msgstr "Error" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:62 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130 msgid "Cost Performance Index" msgstr "Eficiencia en coste" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:160 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:179 msgid "" "Criterion is not valid, the criterion overlap other criterionSatisfaction " "whith same criterion" @@ -3452,7 +3645,7 @@ msgstr "" "Criterion no es válido, otro criterionSatisfaction se solapa con el mismo " "criterion" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:60 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:128 msgid "ETC" msgstr "ETC" @@ -3460,10 +3653,6 @@ msgstr "ETC" msgid "Log out" msgstr "Salir" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:53 -msgid "Edit template" -msgstr "Editar plantilla" - #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:23 msgid "Add new configuration unit" msgstr "Añadir nueva unidad de configuración" @@ -3472,7 +3661,7 @@ msgstr "Añadir nueva unidad de configuración" msgid "Main preferences" msgstr "Preferencias principales" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:160 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:179 msgid "" "Criterion is not valid, it overlaps other criterionSatisfaction with the " "same criterion" @@ -3484,8 +3673,8 @@ msgstr "" msgid "Label type saved" msgstr "Tipo de etiqueta guardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:384 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:527 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:419 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:568 msgid "missing field name in a description value" msgstr "falta nombre de campo en un valor de descripción" @@ -3493,7 +3682,7 @@ msgstr "falta nombre de campo en un valor de descripción" msgid "Add new worker assignment" msgstr "Añadir nueva asignación de trabajador" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:409 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:408 msgid "Show all elements" msgstr "Mostrar todos los elementos" @@ -3501,17 +3690,18 @@ msgstr "Mostrar todos los elementos" msgid "Limited resource" msgstr "Recurso limitante" -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:86 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:80 msgid "Show dependencies:" msgstr "Mostrar dependencias:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:132 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:133 msgid "Hours Group at " msgstr "Grupo de horas en " -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:21 -msgid "Work Report types" -msgstr "Tipos de partes de trabajo" +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:65 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:59 +msgid "Total Estimated hours" +msgstr "Horas totales estimadas" #: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:26 msgid "Your session has expired after inactivity period. Please log in again." @@ -3519,17 +3709,17 @@ msgstr "" "Su sesión ha expirado tras un tiempo de inactividad. Por favor, inicie " "sesión de nuevo." -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:55 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:62 -msgid "Total Estimated hours" -msgstr "Horas totales estimadas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:139 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:164 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:165 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:190 msgid "SPREAD" msgstr "PROPAGACIÓN" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:53 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:304 + +msgid "a day is empty" +msgstr "un día no es válido" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:121 msgid "Budgeted Cost Work Scheduled" msgstr "Coste de trabajo presupuestado planificado" @@ -3537,7 +3727,7 @@ msgstr "Coste de trabajo presupuestado planificado" msgid "Name cannot be null or empty" msgstr "El nombre no puede ser nulo o vacío" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:11 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:31 msgid "Queue Element Information" msgstr "Información de elemento de cola" @@ -3549,19 +3739,24 @@ msgstr "Fecha de inicio" msgid "Create Order" msgstr "Crear pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:56 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:21 + +msgid "Virtual Workers Groups List" +msgstr "Grupos de trabajadores virtuales" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 msgid "Cost Variance" msgstr "Desviación en coste" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:437 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:454 msgid "criterion type does not allow resource hierarchy" msgstr "el tipo de criterio no permite jerarquía de recursos" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:106 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:109 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:142 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:53 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:79 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:142 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:118 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:121 msgid "Total" msgstr "Total" @@ -3569,7 +3764,7 @@ msgstr "Total" msgid "A1" msgstr "A1" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:198 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:217 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:98 msgid "Invalidate" msgstr "Invalidar" @@ -3578,11 +3773,11 @@ msgstr "Invalidar" msgid "Budget hours" msgstr "Horas del presupuesto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:149 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:155 msgid "Edit task: {0}" msgstr "Editar tarea: {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1569 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1582 msgid "OrderElement not found" msgstr "OrderElement no encontrado" @@ -3594,8 +3789,8 @@ msgstr "" "Otro elemento de pedido en la misma rama ya está informando de un avance " "para este formulario de calidad" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:506 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:259 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:506 msgid "must be greater than the previous date." msgstr "debe ser mayor que la fecha anterior" @@ -3603,42 +3798,37 @@ msgstr "debe ser mayor que la fecha anterior" msgid "NavalPlan: Advanced allocation" msgstr "NavalPlan: Asignación avanzada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java:514 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1399 -msgid "Show all" -msgstr "Mostrar todo" - #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:44 msgid "A4" msgstr "A4" -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:27 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1412 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java:533 +msgid "Show all" +msgstr "Mostrar todo" + #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:57 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:27 msgid "Default price" msgstr "Precio por defecto" -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:37 msgid "Estimated hours" msgstr "Horas estimadas" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:132 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:144 msgid "Apply tab changes" msgstr "Aplicar cambios de la pestaña" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:234 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:236 msgid "passwords don't match" msgstr "las contraseñas no conciden" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:51 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:71 msgid "Hours groups" msgstr "Grupos de horas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:202 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:33 -msgid "Subcontracted tasks list" -msgstr "Lista de tareas subcontratadas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:237 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:249 #: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:33 msgid "Create new order" msgstr "Crear pedido nuevo" @@ -3647,23 +3837,38 @@ msgstr "Crear pedido nuevo" msgid "Transfer" msgstr "Transferir" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:126 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:21 + +msgid "Work Hours Types List" +msgstr "Lista de trabajadores" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:145 msgid "Unit {0} cannot be removed because it is used in materials" msgstr "" "La unidad {0} no se puede borrar porque está siendo usada en materiales" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:116 + +msgid "Create User" +msgstr "Crear pedido" + #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:65 msgid "Reference date" msgstr "Fecha de referencia" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:56 -msgid "CV" -msgstr "CV" +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:105 +msgid "NavalPlan: Task Scheduling Status In Project" +msgstr "NavalPlan: Informe de estado de planificación" + +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:117 msgid "Original" msgstr "Original" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 +msgid "CV" +msgstr "CV" + #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:30 msgid "Stretches function configuration" msgstr "Configuración de la función de tramos" @@ -3678,7 +3883,7 @@ msgid "Not indentable" msgstr "No indentable" #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:482 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:74 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:70 msgid "List of materials for all categories (select one to filter)" msgstr "" "Lista de materiales para todas las categorías (seleccione una para filtrar)" @@ -3687,11 +3892,7 @@ msgstr "" msgid "User disabled" msgstr "Usuario deshabilitado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:234 -msgid "Manage scenarios" -msgstr "Gestionar escenarios" - -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:11 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:31 msgid "Order element name" msgstr "Nombre del elemento de pedido" @@ -3699,65 +3900,61 @@ msgstr "Nombre del elemento de pedido" msgid "Association with profiles" msgstr "Asociación con perfiles" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:514 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:517 msgid "end date: {0} must be after start date: {1}" msgstr "fecha de fin: {0} debe ser posterior a la fecha de inicio {1}" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:115 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:114 msgid "worker's surname not specified" msgstr "apellidos del trabajador no especificados" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:207 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:208 msgid "Error on removing workReportType: " msgstr "Error al borrar tipo de parte de trabajo: " -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:47 #: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:47 msgid "Save changes" msgstr "Guardar cambios" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:114 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:199 msgid "Total dedication" msgstr "Dedicación total" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:735 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:743 msgid "Worker deleted" msgstr "Trabajador borrado" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:17 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:42 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:37 msgid "Subcontratation date" msgstr "Fecha de subcontratación" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:23 -msgid "Edit external company" -msgstr "Editar empresa externas" - +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:120 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:58 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:121 msgid "Day" msgstr "Día" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:203 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:33 -msgid "Report advances" -msgstr "Notificar avances" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:153 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:864 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1113 +msgid "Edit Label Type" +msgstr "Editar tipo de etiqueta" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:878 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1126 msgid "Please, select an item" msgstr "Por favor, seleccione un elemento" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:170 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:168 msgid "Order version is the same in source and destination scenarios" msgstr "" "La versión del pedido es la misma en los escenarios de origen y destino" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:176 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:177 msgid "Work report type saved" msgstr "Tipo de partes de trabajo guardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1063 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1077 msgid "Cannot be higher than finish hour" msgstr "No puede ser mayor que la fecha de fin" @@ -3769,18 +3966,18 @@ msgstr "Prefijo" msgid "New Template element" msgstr "Nuevo elemento de plantilla" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:35 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:55 msgid "Subcontracted code" msgstr "Código subcontratado" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:259 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:327 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:249 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:320 msgid "The base calendar parent not found" msgstr "Calendario base padre no encontrado" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:108 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:111 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:120 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:123 msgid "Non Consolidated" msgstr "No consolidado" @@ -3789,33 +3986,48 @@ msgid "Reassigning type" msgstr "Tipo de reasignación" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:48 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:119 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:125 -#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java:71 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java:46 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:120 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:133 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java:72 msgid "Order" msgstr "Pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:856 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:252 + +msgid "Edit Virtual Workers Group" +msgstr "Editar grupos virtuales de trabajadores" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:403 + +msgid "Edit limiting resource element" +msgstr "Borrar elemento de recurso limitante" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:859 msgid "The field name must be unique, not null and not empty" msgstr "El nombre del campo debe ser único, no nulo y no vacío" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:360 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:123 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:146 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:127 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:77 msgid "Position" msgstr "Posición" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:107 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:96 -msgid "Edit work report" -msgstr "Editar parte de trabajo" +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:52 + +msgid "Edit task" +msgstr "Editar tarea: {0}" #: navalplanner-webapp/src/main/webapp/common/layout/login.zul:98 msgid "Incorrect authentication" msgstr "Identificación incorrecta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:99 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:96 +msgid "Edit work report" +msgstr "Editar parte de trabajo" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:184 msgid "All order tasks" msgstr "Todas las tareas del pedido" @@ -3823,7 +4035,7 @@ msgstr "Todas las tareas del pedido" msgid "Value last advance measurement" msgstr "Valor última medida de avance" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:758 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:761 msgid "A description field of the same name already exists." msgstr "Ya existe un campo de descripción con el mismo nombre." @@ -3831,13 +4043,18 @@ msgstr "Ya existe un campo de descripción con el mismo nombre." msgid "Current value" msgstr "Valor actual" -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:45 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:163 + +msgid "Edit Quality Form" +msgstr "Editar formulario de calidad" + #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:51 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:45 msgid "Zoom level" msgstr "Nivel de zoom" #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:27 -#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:159 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:159 msgid "Quality form" msgstr "Formulario de calidad" @@ -3845,22 +4062,26 @@ msgstr "Formulario de calidad" msgid "Profile data" msgstr "Datos del perfil" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:229 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 msgid "Configuration" msgstr "Configuración" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeModel.java:76 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeModel.java:95 msgid "It was not possible load entity. Not found. Id: " msgstr "No ha sido posible cargar la entidad. No encontrada. Id: " +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:503 + +msgid "Create Virtual Workers Group" +msgstr "Crear trabajador virtual" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:70 msgid "Total order element hours" msgstr "Total de horas en elementos de pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:506 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:835 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:878 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:512 msgid "Hours invested" msgstr "Horas invertidas" @@ -3872,32 +4093,37 @@ msgstr "Porcentaje de cantidad de trabajo" msgid "Date last advance reported" msgstr "Fecha último avance notificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:647 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:648 msgid "ALL" msgstr "TODOS" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:220 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:220 msgid "criterion satisfaction's resource not specified" msgstr "recurso del criterio satisfecho no especificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:443 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:458 msgid "Derived exception" msgstr "Excepción derivada" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:31 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:36 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:40 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:35 msgid "Resources search" msgstr "Búsqueda de recursos" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:232 + +msgid "Machines" +msgstr "Máquina" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:144 msgid "Couldn't find element: {0}" msgstr "No se pudo encontrar el elemento: {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:177 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:179 msgid "Confirm deleting this profile. Are you sure?" msgstr "Confirmar el borrado de este perfil. ¿Está seguro?" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:149 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:147 msgid "You should select a destination scenario" msgstr "Debe seleccionar un escenario de destino" @@ -3906,11 +4132,6 @@ msgstr "Debe seleccionar un escenario de destino" msgid "unit type code not found" msgstr "código de tipo de unidad no encontrado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:200 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:44 -msgid "Limiting resources" -msgstr "Recursos limitantes" - #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:41 msgid "Resource :" msgstr "Recurso :" @@ -3923,32 +4144,31 @@ msgstr "Escenario de destino" msgid "Order element" msgstr "Elemento de pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:197 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:106 -msgid "Company view" -msgstr "Vista de la compañía" - #: navalplanner-webapp/src/main/webapp/common/configuration.zul:21 msgid "NavalPlan: Configuration" msgstr "NavalPlan: Configuración" +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:106 +msgid "Company view" +msgstr "Vista de la compañía" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:129 msgid "Just one order sequence must be active" msgstr "Solo una secuencia de pedido debe estar activa" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:4 -msgid "Filter by" -msgstr "Filtrar por" - -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:14 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:75 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:36 #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:75 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:34 msgid "Limiting resource" msgstr "Recurso limitante" +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:24 +msgid "Filter by" +msgstr "Filtrar por" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java:57 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:166 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:126 msgid "Calendar allocation" msgstr "Asignación de calendario" @@ -3956,22 +4176,27 @@ msgstr "Asignación de calendario" msgid "Choose a order element from which create a template from" msgstr "Elija un elemento de pedido a partir del cual crear una plantilla" -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:89 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:12 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:13 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:111 -msgid "Category" -msgstr "Categoría" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:37 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:43 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:46 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:41 msgid "Order Element Information" msgstr "Información de elemento de pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:154 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:85 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:111 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:33 +msgid "Category" +msgstr "Categoría" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:184 msgid "must be greater than finish date" msgstr "debe ser mayor que la fecha de fin" +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 + +msgid "NavalPlan: Materials Needs At Date" +msgstr "NavalPlan: Materiales" + #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:26 msgid "Category data" msgstr "Datos de categoría" @@ -3980,7 +4205,7 @@ msgstr "Datos de categoría" msgid "Search" msgstr "Buscar" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:115 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:119 msgid "Add New Complementary Field" msgstr "Añadir nuevo campo complementario" @@ -3988,37 +4213,37 @@ msgstr "Añadir nuevo campo complementario" msgid "Source scenario" msgstr "Escenario de origen" +#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:49 +msgid "Remove calendar" +msgstr "Borrar calendario" + #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:124 msgid "%" msgstr "%" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:49 -#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:42 -msgid "Remove calendar" -msgstr "Borrar calendario" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1466 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1630 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:583 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:495 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:139 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:207 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:584 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:169 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1479 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1643 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:893 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1137 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:183 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:300 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:833 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1107 msgid "must be lower than finish date" msgstr "debe ser menor que la fecha de fin" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:82 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:84 msgid "Order Element" msgstr "Elemento de pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:711 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:288 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:159 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:719 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:72 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:160 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:69 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:119 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:71 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33 msgid "Resource" msgstr "Recurso" @@ -4027,6 +4252,12 @@ msgstr "Recurso" msgid "Could not load any resource" msgstr "No se pudo cargar un recurso" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:266 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 + +msgid "Work And Progress Per Project" +msgstr "Progreso de trabajo por tarea" + #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:34 msgid "Material search" msgstr "Búsqueda de materiales" @@ -4039,27 +4270,27 @@ msgstr "" "Debe permitir múltiples criterios activos para este tipo para usar esta " "estrategia de asignación" -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:10 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:30 msgid "sub elements" msgstr "sub elementos" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:147 -msgid "Default Label" -msgstr "Etiqueta por defecto" - -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:176 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:88 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:124 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:93 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:88 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:180 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:104 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:136 msgid "Close" msgstr "Cerrar" +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:151 +msgid "Default Label" +msgstr "Etiqueta por defecto" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateController.java:108 #: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:270 msgid "error doing reassignation: {0}" msgstr "Error realizando la reasignación: {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:319 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:318 msgid "Time filter" msgstr "Filtro de tiempo" @@ -4071,55 +4302,75 @@ msgstr "Crear copia" msgid "Company data" msgstr "Datos de la empresa" +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:33 + +msgid "Work Report Lines List" +msgstr "Listado de líneas de parte de trabajo" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:206 +msgid "Unit type code cannot be empty" +msgstr "El código del tipo de unidad no puede ser vacío" + #: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:21 msgid "Criterions Requirement" msgstr "Criterios requeridos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:185 -msgid "Unit type code cannot be empty" -msgstr "El código del tipo de unidad no puede ser vacío" - #: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:46 msgid "Average of the estimated hours" msgstr "Media de horas estimadas" +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:49 +msgid "Length percentage" +msgstr "Porcentaje de longitud" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:158 + +msgid "Create Unit Type" +msgstr "Tipos de unidad" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:176 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:243 msgid "Quality form saved" msgstr "Formulario de calidad guardado" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:49 -msgid "Length percentage" -msgstr "Porcentaje de longitud" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:247 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132 +msgid "Users" +msgstr "Usuario" + +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:136 msgid "Label Type fields" msgstr "Campos de tipo de etiqueta" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:93 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:96 msgid "Hours Management" msgstr "Administración de horas" -#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:146 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:42 + +msgid "specific allocation" +msgstr "Asignación de recursos" + +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:146 msgid "company name has to be unique. It is already used" msgstr "el nombre de la empresa debe ser único. Ya está siendo usado" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:206 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:219 +msgid "Template saved" +msgstr "Plantilla guardada" + #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:62 msgid "Type of day" msgstr "Tipo de día" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:200 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:213 -msgid "Template saved" -msgstr "Plantilla guardada" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:536 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:577 msgid "work report have not any description value with this field name" msgstr "" "El parte de trabajo no tiene ningún valor de descripción con ese nombre de " "campo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:160 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:162 msgid "User saved" msgstr "Usuario guardado" @@ -4127,34 +4378,29 @@ msgstr "Usuario guardado" msgid "Task quality form name" msgstr "Nombre del formulario de calidad de tarea" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:22 -msgid "NavalPlan: Work report admin query" -msgstr "NavalPlan: Consulta de administración de partes de trabajo" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1044 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1045 msgid "Some cost category assignments overlap in time" msgstr "Algunas asignaciones a categorías de coste se solapan en el tiempo" +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:30 +#: navalplanner-webapp/src/main/webapp/common/error.zul:36 +msgid "Exit session" +msgstr "Salir de la sesión" + #: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:30 #: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:52 #: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:66 -#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineGroupTemplate.java:274 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineGroupTemplate.java:274 msgid "Group" msgstr "Grupo" -#: navalplanner-webapp/src/main/webapp/common/error.zul:36 -#: navalplanner-webapp/src/main/webapp/common/event_error.zul:30 -msgid "Exit session" -msgstr "Salir de la sesión" - -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:55 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:26 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:62 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:55 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 msgid "Enabled" msgstr "Activado" @@ -4162,11 +4408,15 @@ msgstr "Activado" msgid "Statistics list " msgstr "Lista de estadísticas " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:297 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:175 +msgid "All resources must be limiting. " +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:296 msgid "Filter by worker" msgstr "Filtrar por trabajadores" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:414 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:441 msgid "" "The task has got advance consolidations.It must delete all consolidations to " "change the resource allocation type " @@ -4178,8 +4428,8 @@ msgstr "" msgid "NavalPlan: Machines" msgstr "NavalPlan: Máquinas" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:43 #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:41 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:43 msgid "Assigned hours" msgstr "Horas asignadas" @@ -4195,41 +4445,41 @@ msgstr "Debe haber al menos dos tramos para hacer interpolación" msgid "Show all labels" msgstr "Mostrar todas las etiquetas" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:297 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:295 msgid "Incompatible update: stored resource is not of type: {0}" msgstr "Actualización incompatible: el recurso almacenado no es de tipo: {0}" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:212 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:75 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:86 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:94 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:112 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:130 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:37 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:41 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:213 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:171 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:86 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:112 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:94 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:40 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:39 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:137 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:82 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:127 #: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:38 #: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:41 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:107 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:75 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:128 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:127 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:137 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:82 msgid "Save & Continue" msgstr "Guardar y continuar" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:45 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:52 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:54 -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:25 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:2 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:2 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:22 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:22 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29 msgid "Filter" msgstr "Filtrar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:581 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:607 msgid "Order saved" msgstr "Pedido guardado" @@ -4237,38 +4487,39 @@ msgstr "Pedido guardado" msgid "Assigned locations" msgstr "Ubicaciones asignadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:238 -msgid "Hours worked per worker" -msgstr "Horas trabajadas por trabajador" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:217 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:238 msgid "Unit type saved" msgstr "Tipo de unidad guardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:501 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:557 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:533 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:589 msgid "Order element {0} : OrderLineGroup is incompatible type with {1}" msgstr "" "Elemento de pedido {0} : El grupo de líneas de pedido tiene un tipo " "incompatible con {1}" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:161 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:163 msgid "Two hour costs with the same type overlap in time" msgstr "Dos costes por hora con el mismo tipo se solapan en el tiempo" -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:63 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:194 + +msgid "Create Machine" +msgstr "Crear máquina" + +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:63 msgid "Ok" msgstr "Aceptar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:54 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:122 msgid "ACWP" msgstr "ACWP" -#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:48 +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:54 msgid "START" msgstr "INICIO" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:406 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:419 msgid "Non limiting resource assignation" msgstr "Asignación de recursos no limitantes" @@ -4282,26 +4533,26 @@ msgstr "Atrás" msgid "Subcontractor" msgstr "Subcontratista" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:220 #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:40 -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:32 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:32 msgid "Administration" msgstr "Administración" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1449 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1612 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:566 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:478 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:567 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1462 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1625 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:875 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1120 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:166 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:281 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:815 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1090 msgid "must be greater than start date" msgstr "debe ser mayor que la fecha de inicio" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:35 -msgid "Work report listing" -msgstr "Listado de partes de trabajo" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:84 + +msgid "Create Company" +msgstr "Crear copia" #: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:46 msgid "Cancel and return" @@ -4316,38 +4567,38 @@ msgstr "Asignar formulario de calidad" msgid "Delete item {0}. Are you sure?" msgstr "Borrar elemento {0}. ¿Está seguro?" +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:38 +msgid "worked hours" +msgstr "horas trabajadas" + #: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:49 msgid "Unit measure name" msgstr "Nombre de la unidad de medida" -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:37 -msgid "worked hours" -msgstr "horas trabajadas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:451 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:489 msgid "a work report line has not this label type assigned" msgstr "una línea de parte de trabajo no tiene este tipo de etiqueta asignada" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:90 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:71 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:74 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:94 msgid "Allocations" msgstr "Asignaciones" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:122 -msgid "Length" -msgstr "Longitud" - -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:33 #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:83 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:33 msgid "Capacity" msgstr "Capacidad" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:177 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:126 +msgid "Length" +msgstr "Longitud" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:337 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:177 msgid "Create derived" msgstr "Crear derivado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:476 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:479 msgid "it must be greater than zero" msgstr "debe ser mayor que cero" @@ -4363,15 +4614,25 @@ msgstr "No se han hecho asignaciones" msgid "Removed calendar \"{0}\"" msgstr "Borrado calendario \"{0}\"" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:103 msgid "START_IN_FIXED_DATE" msgstr "COMENZAR_EN_FECHA_FIJA" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:74 +#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:21 + +msgid "Unit Types List" +msgstr "Lista de tipos de unidades" + +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:37 + +msgid "Edit Criterion Type" +msgstr "Añadir criterio" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:76 msgid "as soon as possible" msgstr "tan pronto como sea posible" -#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:163 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:163 msgid "company NIF has to be unique. It is already used" msgstr "el NIF de la empresa debe ser único. Ya está siendo usado" @@ -4381,7 +4642,7 @@ msgstr "" "Horas humanas por hora de trabajo de máquina dentro de unidad de " "configuración" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:110 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:112 msgid "" "Could not add those authorizations to user {0} because they were already " "present." @@ -4389,8 +4650,8 @@ msgstr "" "No se pudieron añadir esas autorizaciones al usuario {0} porque ya estaban " "presentes." +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:102 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:46 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:101 msgid "New work report" msgstr "Nuevo parte de trabajo" @@ -4398,15 +4659,15 @@ msgstr "Nuevo parte de trabajo" msgid "A3" msgstr "A3" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:90 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:110 msgid "Select gap" msgstr "Seleccionar intervalo" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:61 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:62 msgid "Date Finish" msgstr "Fecha de fin" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:219 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:94 msgid "Validate" msgstr "Validar" @@ -4416,17 +4677,22 @@ msgstr "Validar" msgid "Edit order element" msgstr "Editar elemento de pedido" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:34 -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:3 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:142 + +msgid "This resource has already been added." +msgstr "La categoría de coste ya había sido borrada." + #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:23 msgid "Cost category assignment" msgstr "Asignación de categoría de coste" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:145 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:149 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:487 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:493 msgid "All workers" msgstr "Todos los trabajadores" @@ -4434,59 +4700,73 @@ msgstr "Todos los trabajadores" msgid "Label saved" msgstr "Etiqueta guardada" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:5 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:3 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:3 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector_combo.zul:30 + +msgid "Select criteria or resources" +msgstr "Filtrar por recursos" + +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:25 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:23 msgid "Select required criteria set and press filter button" msgstr "" "Seleccione conjunto de criterios requeridos y pulse el botón de filtrar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:173 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:174 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:175 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:302 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:265 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:280 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:309 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:266 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:175 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:176 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:177 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:302 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:114 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:133 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:42 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:68 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:48 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:127 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:46 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:42 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:43 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:54 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:42 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:48 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:96 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:68 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:46 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:127 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:48 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:39 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:38 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:134 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:92 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:40 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:44 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:42 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:32 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:43 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:49 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:82 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:86 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:42 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:43 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:54 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:18 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:20 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:32 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:39 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:44 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:42 msgid "cannot be null or empty" msgstr "no puede ser nulo o vacío" +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21 + +msgid "NavalPlan: Work And Progress Per Project" +msgstr "NavalPlan: Informe de progreso de trabajo" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:51 #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:61 msgid "New code" msgstr "Código nuevo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:404 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:409 msgid "Calculate Resources per Day" msgstr "Calcular recursos por día" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:990 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:993 msgid "The index fields and labels must be uniques and consecutives" msgstr "Los campos de índice y las etiquetas deben ser únicas y consecutivas" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:129 +msgid "Estimate To Complete" +msgstr "Estimación del coste pendiente" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:249 msgid "" "Are you sure of changing the resource type? You will lose the criterions " @@ -4495,30 +4775,26 @@ msgstr "" "¿Está seguro de cambiar el tipo de recurso? Los criterios con diferente tipo " "de recurso se perderán." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:61 -msgid "Estimate To Complete" -msgstr "Estimación del coste pendiente" +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:21 +msgid "NavalPlan: Estimated/Planned Hours Per Task" +msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:511 msgid "Cannot delete that material because it is assigned to an order." msgstr "No se puede borrar ese material porque está asignado a un pedido." -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:88 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:9 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:10 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:29 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:84 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:109 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:30 msgid "Unit type" msgstr "Tipo de unidad" -#: navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:22 -msgid "NavalPlan: Type of work hours" -msgstr "NavalPlan: Tipo de horas de trabajo" - #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:41 msgid "Load due to other assignments" msgstr "Carga debido a otras asignaciones" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:204 msgid "Order: {0} " msgstr "Pedido: {0} " @@ -4526,19 +4802,31 @@ msgstr "Pedido: {0} " msgid "This machine was already removed by other user" msgstr "Esta máquina ya ha sido borrada por otro usuario" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:234 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:260 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:264 + +msgid "Work Reports" +msgstr "Parte de trabajo" + #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:25 msgid "Calendar data" msgstr "Datos del calendario" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:140 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:140 msgid "login name is already being used by another user" msgstr "el nombre de usuario ya está siendo usado" -#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:106 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:21 + +msgid "Cost Categories List" +msgstr "Listado de categorías de coste" + +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:106 msgid "code is already used" msgstr "el código ya está siendo usado" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:67 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:71 msgid "Task start :" msgstr "Inicio de la tarea :" @@ -4546,30 +4834,36 @@ msgstr "Inicio de la tarea :" msgid "Criterion Requirements" msgstr "Criterios requeridos" +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:110 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:122 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:151 +msgid "Workable Time" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:702 msgid "Calculated advances can not be removed" msgstr "Los avances calculados no se pueden borrar" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:21 -msgid "External companies listing" -msgstr "Listado de empresas externas" - #: navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java:210 msgid "Order from client" msgstr "Pedido del cliente" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:167 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:49 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:68 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:68 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:168 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:126 msgid "OrderElement Code" msgstr "Código del elemento de pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:231 -msgid "Manage user profiles" -msgstr "Administrar perfiles de usuario" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:32 + +msgid "Customer Reference" +msgstr "Referencia de cliente" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:125 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:138 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:617 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:643 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" @@ -4578,11 +4872,11 @@ msgstr "" msgid "Create and assign label" msgstr "Crear y asignar etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:56 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 msgid "SV" msgstr "SV" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1401 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1414 msgid "Filter work reports" msgstr "Filtrar partes de trabajo" @@ -4590,10 +4884,6 @@ msgstr "Filtrar partes de trabajo" msgid "Our company login" msgstr "Nombre de usuario de nuestra empresa" -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:21 -msgid "Cost categories listing" -msgstr "Listado de categorías de coste" - #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:26 msgid "Direct imputation" msgstr "Imputación directa" @@ -4602,7 +4892,7 @@ msgstr "Imputación directa" msgid "Price per hour" msgstr "Precio por hora" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:250 msgid "Calendars" msgstr "Calendarios" @@ -4610,31 +4900,28 @@ msgstr "Calendarios" msgid "NavalPlan: Page not found" msgstr "NavalPlan: Página no encontrada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:323 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:330 msgid "The date cannot be null" msgstr "La fecha no puede ser nula" -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:22 -msgid "NavalPlan: Work report types" -msgstr "NavalPlan: Tipos de partes de trabajo" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:392 msgid "Error on showing delete confirm" msgstr "Error al mostrar la confirmación de borrado" -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:10 -msgid "Show only current satisfied criteria" -msgstr "Mostrar solo los criterios satisfechos actualmente" - -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:69 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:89 msgid "Latest date" msgstr "Fecha más tardía" -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:21 -msgid "Users listing" -msgstr "Listado de usuarios" +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:30 +msgid "Show only current satisfied criteria" +msgstr "Mostrar solo los criterios satisfechos actualmente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:650 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:21 + +msgid "NavalPlan: Advances" +msgstr "NavalPlan: AdvanceTypes" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:666 msgid "Sum of all rows" msgstr "Suma de todas las filas" @@ -4650,14 +4937,20 @@ msgstr "Hora de fin" msgid "Done {0} of {1}" msgstr "Hecho {0} de {1}" +#: navalplanner-webapp/src/main/webapp/users/users.zul:22 + +msgid "NavalPlan: Accounts" +msgstr "NavalPlan: Cuentas de usuario" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:337 -#: navalplanner-business/src/main/java/org/navalplanner/business/common/daos/OrderSequenceDAO.java:72 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/common/daos/OrderSequenceDAO.java:72 msgid "You can not remove this order sequence, it is already in use" msgstr "No se puede borrar esta secuencia de pedido, está siendo usada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:153 -msgid "Edit label type" -msgstr "Editar tipo de etiqueta" +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:22 + +msgid "NavalPlan: Scenarios Management" +msgstr "NavalPlan: planificación" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:138 msgid "" @@ -4671,9 +4964,9 @@ msgstr "" msgid "Each worker configuration unit name" msgstr "Nombre de la unidad de configuración de cada trabajador" +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:132 #: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:40 #: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:41 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:132 msgid "Active" msgstr "Activo" @@ -4682,8 +4975,8 @@ msgstr "Activo" msgid "Value is not valid, the current value must be not empty" msgstr "El valor no es válido, el valor actual no debe ser vacío" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:285 #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:545 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:285 msgid "Unindent" msgstr "Desindentar" @@ -4691,7 +4984,7 @@ msgstr "Desindentar" msgid "Direct labels" msgstr "Etiquetas directas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:157 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:161 msgid "Delete order element" msgstr "Borrar elemento de pedido" @@ -4699,7 +4992,8 @@ msgstr "Borrar elemento de pedido" msgid "Log in" msgstr "Entrar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:56 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:294 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:312 msgid "Order Scheduling" msgstr "Planificación de pedidos" @@ -4711,10 +5005,15 @@ msgstr "Precisión" msgid "Date last advance measurement" msgstr "Fecha de la última medida de avance" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:339 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:372 msgid "missing code in a work report line" msgstr "falta código en una línea de parte de trabajo" +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:21 + +msgid "NavalPlan: Subcontracted Tasks" +msgstr "NavalPlan: Tareas subcontratadas" + #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:28 msgid "Indirect labels" msgstr "Etiquetas indirectas" @@ -4723,14 +5022,14 @@ msgstr "Etiquetas indirectas" msgid "Scheduling state" msgstr "Estado de planificación" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:135 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:70 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:50 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:48 -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:43 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:64 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:51 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:70 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:50 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:136 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:43 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:60 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:51 msgid "Generate code" msgstr "Generar código" @@ -4746,16 +5045,17 @@ msgstr "" msgid "Select print page properties" msgstr "Seleccione las propiedades de la página de impresión" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:211 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21 + +msgid "NavalPlan: Project Costs Per Resource" +msgstr "NavalPlan: Recursos" + +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:211 msgid "criterion satisfaction's criterion not specified" msgstr "criterio del criterio satisfecho no especificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:290 -msgid "Machine" -msgstr "Máquina" - -#: navalplanner-webapp/src/main/webapp/common/error.zul:35 #: navalplanner-webapp/src/main/webapp/common/event_error.zul:29 +#: navalplanner-webapp/src/main/webapp/common/error.zul:35 msgid "Reload" msgstr "Recargar" @@ -4771,34 +5071,38 @@ msgstr "" msgid "Edit order element {0}" msgstr "Editar elemento de pedido {0}" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:233 + +msgid "Virtual Workers Groups" +msgstr "Grupos de trabajadores virtuales" + #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:25 msgid "Profiles authorization" msgstr "Autorización de perfiles" +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:90 +msgid "Assignation" +msgstr "Asignación" + #: navalplanner-webapp/src/main/webapp/common/configuration.zul:98 msgid "Planning charts expanded" msgstr "Gráficos de planificación expandidos" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:79 -msgid "Assignation" -msgstr "Asignación" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1263 +msgid "Add new advance measurement" +msgstr "Añadir nueva medida de avance" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:425 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:316 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:45 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:428 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:45 msgid "Not deletable" msgstr "Imborrable" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:148 -msgid "Create quality form" -msgstr "Crear formulario de calidad" - -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:71 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:34 #: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:26 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:45 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:77 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:71 msgid "NIF" msgstr "NIF" @@ -4811,11 +5115,16 @@ msgstr "" "existentes.\n" "No se pueden usar elementos de pedido nuevos." +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39 + +msgid "Edit Advance Type" +msgstr "Editar datos del tipo de avance" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:168 msgid "Doing {0} reassignations" msgstr "Realizando {0} reasignaciones" -#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:45 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:45 msgid "code not specified" msgstr "código no especificado" @@ -4823,42 +5132,47 @@ msgstr "código no especificado" msgid "Confirmation" msgstr "Confirmación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:186 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:187 msgid "" "Cannot delete work report type. There are some work reports bound to it." msgstr "" "No se puede borrar el tipo de parte de trabajo. Hay algún parte de trabajo " "ligado a él." +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:21 + +msgid "Criterion Type List" +msgstr "Lista de tipos de criterio" + #: navalplanner-webapp/src/main/webapp/common/layout/login.zul:73 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:47 msgid "Password" msgstr "Contraseña" -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:87 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 msgid "Observations" msgstr "Observaciones" #: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:26 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:163 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:185 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:209 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:162 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:184 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:208 msgid "Valid from" msgstr "Válido desde" +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:56 +msgid "Month" +msgstr "Mes" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:289 msgid "There exists other template with the same name." msgstr "Ya existe otra plantilla con el mismo nombre." -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:214 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:204 msgid "exception date already exists" msgstr "la fecha de excepción ya existe" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:56 -msgid "Month" -msgstr "Mes" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:733 msgid "Advanced assignment saved" msgstr "Asignación avanzada guardada" @@ -4867,7 +5181,7 @@ msgstr "Asignación avanzada guardada" msgid "At least one order sequence is needed" msgstr "Se necesita al menos una secuencia de pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:777 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:808 msgid "Edit order" msgstr "Editar pedido" @@ -4877,21 +5191,26 @@ 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 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:194 msgid "criterion satisfaction's start date not specified" msgstr "fecha de inicio del criterio satisfecho no especificada" +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:36 + +msgid "Create Advance Type" +msgstr "Crear un nuevo tipo de avance" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:50 #: navalplanner-webapp/src/main/webapp/common/layout/template.zul:87 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:130 +#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:47 +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:77 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:59 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:114 #: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:38 #: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:42 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:82 -#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:47 #: navalplanner-webapp/src/main/webapp/planner/main.zul:65 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:85 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:99 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:154 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:110 msgid "Accept" msgstr "Aceptar" @@ -4906,12 +5225,13 @@ msgstr "" "Crear nueva asignación de material fuera de la asignación de material {0}. " "¿Está seguro?" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:238 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:261 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:239 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:262 +#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:39 msgid "Edit Worker" msgstr "Editar trabajador" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:192 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:193 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:151 msgid "Work report lines" msgstr "Líneas del parte de trabajo" @@ -4920,18 +5240,18 @@ msgstr "Líneas del parte de trabajo" msgid "Calculated" msgstr "Calculado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:202 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:206 msgid "Completed: {0}% " msgstr "Completado: {0}% " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:116 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:114 msgid "Error setting up edition form for Criterion Type with id: {0}" msgstr "" "Error preparando el formulario de edición para el tipo de criterio con id: " "{0}" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:592 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:528 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:550 msgid "" "Confirm creating a new order version for this scenario and derived. Are you " "sure?" @@ -4939,8 +5259,8 @@ msgstr "" "Confirmar la creación de una nueva versión del pedido para este escenario y " "sus derivados. ¿Está seguro?" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:309 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:315 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:328 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:334 msgid " The " msgstr " El " @@ -4948,17 +5268,17 @@ msgstr " El " msgid "Access to the system" msgstr "Acceso al sistema" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:107 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:122 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:140 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:111 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:143 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:117 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:207 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179 msgid "Click on " msgstr "Click en" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:110 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:111 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:99 msgid "Report data" msgstr "Datos del informe" @@ -4976,11 +5296,7 @@ msgstr "Elementos de pedido" msgid "Report advance" msgstr "Notificar avance" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/InstanceNotFoundRecoverableErrorException.java:45 -msgid "instance not found" -msgstr "instancia no encontrada" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:81 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:92 msgid "Priority" msgstr "Prioridad" @@ -4988,51 +5304,54 @@ msgstr "Prioridad" msgid "Landscape" msgstr "Apaisado" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:392 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/InstanceNotFoundRecoverableErrorException.java:45 +msgid "instance not found" +msgstr "instancia no encontrada" + +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:409 msgid "criterion names must be unique inside a criterion type" msgstr "el nombre del criterio debe ser único dentro de un tipo de criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:760 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:78 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplateFinder.java:51 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:63 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:130 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:50 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:65 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:78 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:776 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:39 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:65 #: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:39 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:35 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:43 #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:33 -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:35 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:63 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:85 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:46 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:74 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:26 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:25 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:39 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:74 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:85 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:89 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:110 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:55 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:74 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:7 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:45 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:25 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:81 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:7 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:72 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:27 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:83 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:120 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:98 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:95 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:50 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:64 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:131 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:35 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:59 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:81 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:107 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:72 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:27 #: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:48 #: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:52 #: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:74 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:26 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:46 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:74 msgid "Code" msgstr "Código" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:10 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:30 msgid "Filters" msgstr "Filtros" @@ -5040,31 +5359,27 @@ msgstr "Filtros" msgid "Add stretch" msgstr "Añadir tramo" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:78 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:89 msgid "Assignation type" msgstr "Tipo de asignación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:216 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:201 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:220 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:235 msgid "" "Start date is not valid, the new start date must be lower than the end date" msgstr "" "La fecha de inicio no es válida, la fecha de inicio nueva debe ser anterior " "a la fecha de fin" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:501 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:934 -msgid "Hours for an exception day should be greater or equal than zero" -msgstr "" -"Las horas para un día de excepción deben ser mayores o iguales que cero" - #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:52 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:86 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:121 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:57 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:100 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:96 msgid "Start date" msgstr "Fecha de inicio" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:133 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:132 msgid "Update exception" msgstr "Actualizar excepción" @@ -5087,18 +5402,23 @@ msgid "Unit name" msgstr "Nombre de la unidad" #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:56 msgid "Write" msgstr "Escribir" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:373 -msgid "Assign element to queue automatically" -msgstr "Asignar elemento a la cola automáticamente" +#: navalplanner-webapp/src/main/webapp/labels/labelTypes.zul:20 + +msgid "NavalPlan: Labels" +msgstr "NavalPlan: Tipos de etiquetas" #: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:38 msgid "Number of applications" msgstr "Número de aplicaciones" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:461 +msgid "Assign element to queue automatically" +msgstr "Asignar elemento a la cola automáticamente" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:42 msgid "Filter type" msgstr "Tipo de filtro" @@ -5111,12 +5431,20 @@ msgstr "" "Fecha después de la cual la tarea debe empezar (presione enter en el cuadro " "de texto para abrir el calendario o escriba la fecha directamente)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:192 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:450 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:465 msgid "Normal" msgstr "Normal" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:282 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1286 +msgid "" +"This advance can not be removed, because it is spread. It is necessary to " +"select another advance as spread." +msgstr "" +"Este avance no se puede eliminar porque es propagado. Es necesario " +"seleccionar otro avance como propagado." + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:289 msgid "Date cannot be null" msgstr "La fecha no puede ser nula" @@ -5125,30 +5453,35 @@ msgstr "La fecha no puede ser nula" msgid "Advance type" msgstr "Tipo de avance" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:741 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:94 + +msgid "Create Profile" +msgstr "Crear derivado" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:744 msgid "This label type already is assigned to the work report type." msgstr "Este tipo de etiqueta ya está asignado al tipo de parte de trabajo." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:512 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:286 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:461 -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:48 -msgid "Load" -msgstr "Carga" - #: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:27 msgid "New criterion" msgstr "Criterio nuevo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:839 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:61 -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:62 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:332 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:461 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:511 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:48 +msgid "Load" +msgstr "Carga" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:882 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:61 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:59 #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:35 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:86 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:62 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:31 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:82 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:112 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:38 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:58 #: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:40 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:46 @@ -5159,55 +5492,69 @@ msgstr "Descripción" msgid "Expand all taskgroups" msgstr "Expandir todos los grupos de tareas" -#: navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:22 -msgid "NavalPlan: External companies" -msgstr "NavalPlan: Empresas externas" - -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:22 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:22 msgid "NavalPlan: Criteria" msgstr "NavalPlan: Criterios" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:133 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:145 msgid "Go to advanced Allocation" msgstr "Ir a asignación avanzada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:505 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:508 msgid "already exists an allocation for criteria {0}" msgstr "ya existe una asignación para los criterios {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:453 -msgid "Invalid queue element" -msgstr "elemento de cola inválido" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:228 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:270 + +msgid "Project Templates" +msgstr "Crear plantilla" #: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:42 msgid "Number of finished applications" msgstr "Número de aplicaciones finalizadas" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:478 +msgid "Invalid queue element" +msgstr "elemento de cola inválido" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:566 #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:575 #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:583 msgid "Unnasigned" msgstr "No asignado" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:100 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:110 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:135 + +msgid "please, select a order" +msgstr "Por favor, seleccione un pedido" + +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:64 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:61 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:156 +msgid "User" +msgstr "Usuario" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:402 msgid "At least one HoursGroup is needed" msgstr "Es necesario al menos un HoursGroup" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:61 -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:64 -#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:156 -msgid "User" -msgstr "Usuario" - #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:69 msgid "Interacts with applications" msgstr "Interactúa con aplicaciones" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:256 + +msgid "Virtual worker" +msgstr "Lista de trabajadores virtuales" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:168 msgid "Order {0} transfered" msgstr "Pedido {0} transferido" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:46 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:46 msgid "Multiple values per resource" msgstr "Múltiples valores por recurso" @@ -5215,16 +5562,12 @@ msgstr "Múltiples valores por recurso" msgid "Hours:" msgstr "Horas:" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:37 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:42 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:57 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:63 msgid "Split" msgstr "Dividir" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:33 -msgid "Work report lines listing" -msgstr "Listado de líneas de parte de trabajo" - -#: navalplanner-webapp/src/main/webapp/planner/order.zul:171 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:131 msgid "Select the calendar" msgstr "Seleccionar el calendario" @@ -5236,7 +5579,24 @@ msgstr "" "Esta medida de avance no se puede cambiar o borrar, porque está consolidada. " "Se requiere borrar su consolidación." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:719 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:67 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:24 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:27 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:86 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:44 +msgid "Starting date" +msgstr "Fecha de inicio" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:134 +msgid "Order sequence prefixes can not be repeated" +msgstr "Los prefijos de secuencia de pedido no pueden repetirse" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:745 msgid "" "You can not remove the order \"{0}\" because of any of its order elements " "are already in use in some work reports and the order just exists in the " @@ -5246,87 +5606,69 @@ msgstr "" "usando en algún parte de trabajo y el pedido solo existe en el escenario " "actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:134 -msgid "Order sequence prefixes can not be repeated" -msgstr "Los prefijos de secuencia de pedido no pueden repetirse" - -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:27 -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:32 -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:67 -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:18 -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:24 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:22 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:86 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:24 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:29 -msgid "Starting date" -msgstr "Fecha de inicio" - -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 -msgid "NavalPlan: Timeline material report" -msgstr "NavalPlan: Informe de materiales a lo largo del tiempo" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:965 msgid "Function" msgstr "Función" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:85 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:98 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:119 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:89 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:121 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:95 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:85 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:550 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:557 +msgid "Repeated Order code {0} in Order {1}" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:171 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:141 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:187 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:160 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:139 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:198 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157 msgid "Format" msgstr "Formato" -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:21 -msgid "Workers list" -msgstr "Lista de trabajadores" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:93 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:529 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:68 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:644 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1010 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:487 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:370 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:36 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:76 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:39 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:88 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:32 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:39 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:41 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:49 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:48 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:42 -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:23 -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:24 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:36 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:72 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:704 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1040 #: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:40 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:36 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:37 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:41 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:47 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:48 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:77 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:36 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:88 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:23 #: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:34 #: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:36 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:48 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:24 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:36 msgid "Edit" msgstr "Editar" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:165 + +msgid "Edit Unit Type" +msgstr "Tipos de unidad" + #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:96 msgid "Responsible" msgstr "Responsable" -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:15 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:67 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:35 msgid "Init date" msgstr "Fecha de inicio" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:153 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:152 msgid "By default" msgstr "Por defecto" @@ -5339,7 +5681,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:1119 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1120 msgid "" "resources cost category assignment codes must be unique inside a resource" msgstr "" @@ -5351,7 +5693,7 @@ msgstr "" msgid "XML" msgstr "XML" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:165 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:184 msgid "" "CriterionType is not valid, the criterionType overlap other " "criterionSatisfaction whith same criterionType" @@ -5363,10 +5705,10 @@ msgstr "" msgid "Unable to convert {0} value to {1} type" msgstr "No se pudo convertir el valor {0} al tipo {1}" -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:87 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:10 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:11 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:83 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:110 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:31 msgid "Unit price" msgstr "Precio de la unidad" @@ -5378,14 +5720,14 @@ msgstr "Fecha de comunicación" msgid "Reassigning" msgstr "Reasignando" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:470 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:471 msgid "" "Cannot delete that cost category because there are resources assigned to it." msgstr "" "No se puede borrar la categoría de coste porque hay recursos asignados a " "ella." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:481 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:484 msgid "{0} already assigned to resource allocation list" msgstr "{0} ya está en la lista de asignación de recursos" @@ -5393,32 +5735,49 @@ msgstr "{0} ya está en la lista de asignación de recursos" msgid "Unit Measure" msgstr "Unidad de medida" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:400 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:407 msgid "The type of hours cannot be null." msgstr "El tipo de horas no puede ser nulo." +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:21 + +msgid "Label Types List" +msgstr "Campos de tipo de etiqueta" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:53 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:52 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:40 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:62 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:126 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionBandboxFinder.java:46 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:65 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:40 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:42 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:172 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:24 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:35 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:110 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:151 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:95 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:125 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:165 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:140 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:137 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:178 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:40 -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:58 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:65 -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:35 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:24 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:42 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:41 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:63 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:127 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:40 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:46 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:152 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:40 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:42 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:173 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:52 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:46 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:58 msgid "Type" msgstr "Tipo" @@ -5434,11 +5793,11 @@ msgstr "" msgid "Associated Criteria" msgstr "Criterios asignados" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:53 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:121 msgid "BCWS" msgstr "BCWS" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:280 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:319 msgid " in the specified directory." msgstr " en el directorio especificado." @@ -5446,51 +5805,55 @@ msgstr " en el directorio especificado." msgid "Autogenerated" msgstr "Autogenerado" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1113 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1114 msgid "criterion satisfaction codes must be unique inside a resource" msgstr "el código del criterio debe ser único dentro de un recurso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:240 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 -msgid "Working progress per task" -msgstr "Progreso de trabajo por tarea" - #: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:30 msgid "New order element name:" msgstr "Nombre del nuevo elemento de pedido:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:37 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:359 + +msgid "missing code in a work report." +msgstr "falta código en una línea de parte de trabajo" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:36 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:73 msgid "Criterion" msgstr "Criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:228 -msgid "Manage types of work hours" -msgstr "Administrar tipos de horas de trabajo" - #: navalplanner-webapp/src/main/webapp/common/configuration.zul:65 msgid "Generate code for" msgstr "Generar código para" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:45 msgid "Limiting resources (order)" msgstr "Recursos limitantes (pedido)" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:364 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:443 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:397 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:481 #: navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/impl/LabelConverter.java:102 msgid "missing code in a label" msgstr "falta el código en una etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:54 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:122 msgid "Actual Cost Work Performed" msgstr "Coste de trabajo realizado" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:246 + +msgid "NavalPlan Configuration" +msgstr "NavalPlan: Configuración" + #: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:50 msgid "Average of the worked hours" msgstr "Media de horas trabajadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:488 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:548 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" @@ -5500,7 +5863,7 @@ msgstr "" " El código no puede contener caracteres como '_' \n" " y no debe ser vacío" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorization.java:42 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorization.java:42 msgid "an authorization type must be set" msgstr "debe seleccionar un tipo de autorización" @@ -5508,43 +5871,61 @@ 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)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:123 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:48 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:78 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:140 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:85 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:115 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:154 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:88 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:129 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:88 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:167 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:86 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:44 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:74 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:34 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:165 msgid "Add" msgstr "Añadir" -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:51 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:104 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:124 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:47 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:73 msgid "Unselect" msgstr "Deseleccionar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:464 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:479 msgid "You should select the type of exception" msgstr "Debe seleccionar el tipo de excepción" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:92 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:41 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:91 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:31 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:91 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:51 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:41 msgid "Deadline" msgstr "Fecha límite" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:704 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:730 msgid "You don't have permissions to edit this order" msgstr "No tiene permisos para editar este pedido" -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:102 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:122 msgid "Filter by categories or materials" msgstr "Filtrar por categorías o materiales" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:106 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:237 + +msgid "Subcontracted Tasks" +msgstr "Lista de tareas subcontratadas" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:320 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:106 msgid "Advance measurements" msgstr "Medidas de avance" @@ -5556,24 +5937,31 @@ msgstr "El porcentaje de cantidad de trabajo debe estar entre 0 y 100" msgid "Machine data" msgstr "Datos de la máquina" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:59 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:127 msgid "VAC" msgstr "VAC" -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:27 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:33 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:54 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:27 msgid "Label type" msgstr "Tipo de etiqueta" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:245 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:189 msgid "Advanced Allocation" msgstr "Asignación avanzada" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:245 + +msgid "Administration / Management" +msgstr "Administración" + #: navalplanner-webapp/src/main/webapp/templates/templates.zul:58 msgid "Template Tree" msgstr "Árbol de plantillas" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:505 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:33 msgid "Alpha" msgstr "Alfa" @@ -5583,12 +5971,12 @@ msgstr "Alfa" msgid "inconsistent parent code." msgstr "código padre inconsistente." -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:80 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:84 msgid "Recommended Allocation" msgstr "Asignación recomendada" #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:67 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:14 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:34 msgid "Status" msgstr "Estado" @@ -5596,35 +5984,29 @@ msgstr "Estado" msgid "Resource load view" msgstr "Vista de carga de recursos" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:21 -msgid "NavalPlan: Hours worked report" -msgstr "NavalPlan: Informe de horas trabajadas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:752 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:959 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:59 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:768 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:69 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:959 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:73 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:53 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:91 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:49 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:43 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:98 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:68 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:75 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:50 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:80 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:16 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:110 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:123 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:152 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:47 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:110 msgid "Hours" msgstr "Horas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:575 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:562 msgid "the date must be inside the visualization area" msgstr "la fecha debe estar dentro del área de visualización" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:372 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:405 msgid "work report has not this label type assigned" msgstr "el parte de trabajo no tiene asignado este tipo de etiqueta" @@ -5644,10 +6026,17 @@ msgstr "Tipo de formulario de calidad" msgid "The name of the criterion is empty." msgstr "El nombre del criterio está vacío." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:345 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:354 msgid " hours" msgstr " horas" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:227 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:137 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:151 + +msgid "Limiting Resources Planning" +msgstr "Asignación de recursos limitantes" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:740 msgid "The max value must be not empty" msgstr "el valor máximo no puede ser vacío" @@ -5656,13 +6045,13 @@ msgstr "el valor máximo no puede ser vacío" msgid "New label" msgstr "Nueva etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:327 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:331 +#: 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" msgstr "La fecha de inicio no puede ser nula" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:64 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:55 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:75 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:68 msgid "Allocation configuration" msgstr "Configuración de asignación" @@ -5670,38 +6059,30 @@ msgstr "Configuración de asignación" msgid "Scenario \"{0}\" saved" msgstr "Escenario \"{0}\" guardado" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:31 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:51 msgid "Subcontract price" msgstr "Precio de subcontratación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:251 -msgid "Edit virtual worker groups" -msgstr "Editar grupos virtuales de trabajadores" +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:23 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:21 +msgid "Assigned criteria" +msgstr "Criterios asignados" #: navalplanner-webapp/src/main/webapp/common/layout/login.zul:47 msgid "Help on authentication (opens a new window)" msgstr "Ayuda sobre la identificación (abre una ventana nueva)" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:30 -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:1 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:3 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:29 -msgid "Assigned criteria" -msgstr "Criterios asignados" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:864 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:867 msgid "The length must be greater than 0, and not null." msgstr "La longitud debe ser mayor que cero y no nula." -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:21 -msgid "Machines list" -msgstr "Lista de máquinas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:479 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:490 msgid "Could not save new calendar" msgstr "No se pudo guardar el calendario nuevo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:132 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:151 msgid "Deleted unit type {0}" msgstr "Borrado tipo de unidad {0}" @@ -5709,6 +6090,11 @@ msgstr "Borrado tipo de unidad {0}" msgid "All advance types have already been assigned." msgstr "Todos los tipos de avance ya han sido asignados." +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:21 + +msgid "Advance Types List" +msgstr "Lista de tipos de avance" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:135 msgid "Couldn't find criterion {0}" msgstr "No se pudo encontrar el criterio {0}" @@ -5717,40 +6103,44 @@ msgstr "No se pudo encontrar el criterio {0}" msgid "Could not save the scenario" msgstr "No se pudo guardar el escenario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:196 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:329 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:270 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41 + +msgid "Task Scheduling Status In Project" +msgstr "Estado de las tareas de planificacion de un pedido" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:197 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:353 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:40 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:329 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:40 msgid "Confirm" msgstr "Confirmar" -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:55 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:35 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:51 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:62 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:61 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:50 -#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:31 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:32 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:47 #: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:49 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:48 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:59 -#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:31 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:50 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:61 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:63 #: navalplanner-webapp/src/main/webapp/calendars/_list.zul:31 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:31 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:55 +#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:31 #: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:48 #: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:44 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:59 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:32 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:47 msgid "Create" msgstr "Crear" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:41 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:78 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 msgid "Permissions" msgstr "Permisos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1646 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1652 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1659 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1665 msgid "please, select a work report type" msgstr "por favor, seleccione un tipo de parte de trabajo" @@ -5758,178 +6148,234 @@ msgstr "por favor, seleccione un tipo de parte de trabajo" msgid "List of materials for category: {0}" msgstr "Lista de materiales para la categoría {0}" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:11 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:12 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:32 msgid "Total price" msgstr "Precio total" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:221 -msgid "Manage advance types" -msgstr "Gestionar tipos de avance" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1149 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1161 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:430 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:313 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:728 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:598 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:262 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:283 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:248 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:413 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:427 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:140 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:160 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:247 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:412 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:426 #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:583 #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:589 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:366 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:673 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:313 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:598 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:736 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:651 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:863 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1056 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:231 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1161 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1173 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:433 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:262 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:283 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:387 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1255 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:199 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:384 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1255 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1026 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:647 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:859 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1062 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:177 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:42 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:82 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:42 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:50 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:65 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:54 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:69 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1056 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:179 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:689 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:366 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:42 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:68 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:116 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:131 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:89 #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:53 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:107 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:90 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:41 -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:41 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:53 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:90 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:39 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:54 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:85 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:50 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:45 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:54 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:120 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:161 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:135 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:175 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:109 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:150 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:110 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:106 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:147 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:188 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:83 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:42 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:103 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:66 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:78 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:101 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:90 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:101 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:66 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:53 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:109 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:39 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:60 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:90 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:120 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:39 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:66 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:53 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:109 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:41 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:90 msgid "Delete" msgstr "Borrar" -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:30 -msgid "Number of assigned hours." -msgstr "Número de horas asignadas." - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:31 -msgid "Number of hours calculated by clock." -msgstr "número de horas calculado basado en reloj." - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:32 -msgid "Number of assigned hours and the time." -msgstr "Número de horas asignadas y hora." - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:33 -msgid "heading" -msgstr "cabecera" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:33 -msgid "line" -msgstr "línea" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:32 -msgid "RESOURCE" -msgstr "RECURSO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:33 -msgid "WORKER" -msgstr "TRABAJADOR" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:34 -msgid "MACHINE" -msgstr "MÁQUINA" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1144 -msgid "yes" -msgstr "sí" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1144 -msgid "no" -msgstr "no" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:53 -msgid "[generic all workers]" -msgstr "[genérico todos los trabajadores]" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:71 -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:112 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:71 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:112 msgid "You can not modifiy this order sequence, it is already in use" msgstr "No se puede modificar esta secuencia de pedido, está siendo usada" -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:121 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:121 #, java-format msgid "number of digits must be between {0} and {1}" msgstr "el número de dígitos debe estar entre {0} y {1}" -#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java:121 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:34 +msgid "WORK_RELATIONSHIP" +msgstr "RELACIÓN LABORAL" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:40 +msgid "LOCATION_GROUP" +msgstr "LOCALIZACIÓN / GRUPO" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:46 +msgid "LEAVE" +msgstr "BAJA" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:52 +msgid "TRAINING" +msgstr "FORMACIÓN" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:58 +msgid "JOB" +msgstr "TRABAJO" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:64 +msgid "CATEGORY" +msgstr "CATEGORÍA" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:53 +msgid "[generic all workers]" +msgstr "[genérico todos los trabajadores]" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:32 +msgid "RESOURCE" +msgstr "RECURSO" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:33 +msgid "WORKER" +msgstr "TRABAJADOR" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:34 +msgid "MACHINE" +msgstr "MÁQUINA" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1145 +msgid "yes" +msgstr "sí" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1145 +msgid "no" +msgstr "no" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java:121 msgid "Line" msgstr "Línea" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueDependency.java:124 -msgid "A queue dependency has to have an origin different from destiny" -msgstr "Una dependencia en la cola debe tener un origen distinto del destino" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:30 -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/QueuePosition.java:52 -msgid "Hour should be a value between 0 and 23" -msgstr "La hora debe ser un valor entre 0 y 23" +msgid "Number of assigned hours" +msgstr "Número de horas asignadas." -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31 -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:29 -msgid "Pending" -msgstr "Pendiente" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:31 -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31 -msgid "Failed sent" -msgstr "Fallo en el envío" +msgid "Number of hours calculated by clock" +msgstr "número de horas calculado basado en reloj." -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:32 -msgid "Success sent" -msgstr "Éxito en el envío" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:32 -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:27 -msgid "Finished" -msgstr "Terminado" +msgid "Number of assigned hours and the time" +msgstr "Número de horas asignadas y hora." -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:28 -msgid "In progress" -msgstr "En progreso" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:33 +msgid "heading" +msgstr "cabecera" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:30 -msgid "Blocked" -msgstr "Bloqueado" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:33 +msgid "line" +msgstr "línea" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:186 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:31 +msgid "RECEIVED" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:32 + +msgid "PENDING" +msgstr "FIN" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:33 + +msgid "ORDERED" +msgstr "OFRECIDO" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:34 +msgid "PROCESSING" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:35 + +msgid "CANCELED" +msgstr "CANCELADO" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java:899 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:646 +msgid "Cannot spread two advances in the same order element" +msgstr "No puede haber dos avances que propagan en un elemento de pedido" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:567 +msgid "" +"Some ancestor has the same label assigned, so this element is already " +"inheriting this label" +msgstr "" +"Algún antecesor tiene la misma etiqueta asignada, así que este elemento ya " +"está heredando esa etiqueta" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:670 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:697 +msgid "Duplicate Advance Assignment For Order Element" +msgstr "Asignación de avance duplicada en el elemento de pedido" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:259 +msgid "workHours should be greater or equals to 0" +msgstr "Las horas de trabajo deben ser mayores o iguales a cero" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:271 +msgid "" +"\"workHours\" value is not valid, taking into account the current list of " +"HoursGroup" +msgstr "" +"El valor de horas de trabajo no es válido, teniendo en cuenta la lista " +"actual de grupos de horas" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:186 msgid "the resource type should be Worker or Machine" msgstr "el tipo de recurso debe ser Trabajador o Máquina" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:195 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:195 msgid "Working hours shouldn't be negative" msgstr "Las horas de trabajo no pueden ser negativas" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:224 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:224 msgid "Total percentage should be less than 100%" msgstr "El porcentaje total debe ser menor que 100%" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:273 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:273 #, java-format msgid "" " The criterion {0} can not be assigned to this hoursGroup because its " @@ -5938,7 +6384,7 @@ msgstr "" " El criterio {0} no se puede asignar a este grupo de horas porque su tipo de " "recurso es diferente." -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:279 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:279 #, java-format msgid "" " The criterion {0} can not be assigned to this hoursGroup because it " @@ -5947,156 +6393,282 @@ msgstr "" " El criterio {0} no se puede asignar a este grupo de horas porque ya existe " "en el grupo." -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:168 -#, java-format -msgid "{0} is already child of another {1}" -msgstr "{0} ya es hijo de otro {1}" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 +msgid "OFFERED" +msgstr "OFRECIDO" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:214 -msgid "it's already somewhat scheduled" -msgstr "ya está planificado de alguna manera" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 +msgid "ACCEPTED" +msgstr "ACEPTADO" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:228 -msgid "it can't be unscheduled" -msgstr "no se puede quitar la planificación" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 +msgid "STARTED" +msgstr "EMPEZADO" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:366 -msgid "Completely scheduled" -msgstr "Completamente planificado" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 +msgid "FINISHED" +msgstr "TERMINADO" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:368 -msgid "Partially scheduled" -msgstr "Parcialmente planificado" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 +msgid "CANCELLED" +msgstr "CANCELADO" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:370 -msgid "Unscheduled" -msgstr "No planificado" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 +msgid "SUBCONTRACTED PENDING ORDER" +msgstr "SUBCONTRATADO PENDIENTE PEDIDO" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:376 -msgid "C" -msgstr "C" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 +msgid "STORED" +msgstr "ALMACENADO" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:378 -msgid "P" -msgstr "P" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:380 -msgid "U" -msgstr "N" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:568 -msgid "" -"Some ancestor has the same label assigned, so this element is already " -"inheriting this label" -msgstr "" -"Algún antecesor tiene la misma etiqueta asignada, así que este elemento ya " -"está heredando esa etiqueta" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:647 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java:881 -msgid "Cannot spread two advances in the same order element" -msgstr "No puede haber dos avances que propagan en un elemento de pedido" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:671 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:698 -msgid "Duplicate Advance Assignment For Order Element" -msgstr "Asignación de avance duplicada en el elemento de pedido" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java:536 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java:536 #, java-format msgid " The {0} already exist into other order element" msgstr " El {0} ya existe en otro elemento de pedido" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 -msgid "OFFERED" -msgstr "OFRECIDO" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:168 +#, java-format +msgid "{0} is already child of another {1}" +msgstr "{0} ya es hijo de otro {1}" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 -msgid "ACCEPTED" -msgstr "ACEPTADO" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:214 +msgid "it's already somewhat scheduled" +msgstr "ya está planificado de alguna manera" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 -msgid "STARTED" -msgstr "EMPEZADO" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:228 +msgid "it can't be unscheduled" +msgstr "no se puede quitar la planificación" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 -msgid "FINISHED" -msgstr "TERMINADO" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:366 +msgid "Completely scheduled" +msgstr "Completamente planificado" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 -msgid "CANCELLED" -msgstr "CANCELADO" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:368 +msgid "Partially scheduled" +msgstr "Parcialmente planificado" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 -msgid "SUBCONTRACTED PENDING ORDER" -msgstr "SUBCONTRATADO PENDIENTE PEDIDO" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:370 +msgid "Unscheduled" +msgstr "No planificado" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 -msgid "STORED" -msgstr "ALMACENADO" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:376 +msgid "C" +msgstr "C" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:259 -msgid "workHours should be greater or equals to 0" -msgstr "Las horas de trabajo deben ser mayores o iguales a cero" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:378 +msgid "P" +msgstr "P" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:271 -msgid "" -"\"workHours\" value is not valid, taking into account the current list of " -"HoursGroup" -msgstr "" -"El valor de horas de trabajo no es válido, teniendo en cuenta la lista " -"actual de grupos de horas" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:380 +msgid "U" +msgstr "N" -#: navalplanner-business/src/main/java/org/navalplanner/business/scenarios/entities/Scenario.java:175 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:32 +msgid "Read authorization" +msgstr "Autorización de lectura" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:33 +msgid "Write authorization" +msgstr "Autorización de escritura" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:33 +msgid "Web service reader" +msgstr "Lectura de servicios web" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:34 +msgid "Web service writer" +msgstr "Escritura de servicios web" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:35 +msgid "All orders read allowed" +msgstr "Permitida lectura de todos los pedidos" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:36 +msgid "All orders edition allowed" +msgstr "Permitida edición de todos los pedidos" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:37 +msgid "Order creation allowed" +msgstr "Permitida creación de pedidos" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/scenarios/entities/Scenario.java:175 #, java-format msgid "Derived from {0}" msgstr "Derivado de {0}" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:32 -msgid "Read authorization" -msgstr "Autorización de lectura" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/QueuePosition.java:52 +msgid "Hour should be a value between 0 and 23" +msgstr "La hora debe ser un valor entre 0 y 23" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:33 -msgid "Write authorization" -msgstr "Autorización de escritura" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueDependency.java:169 +msgid "A queue dependency has to have an origin different from destiny" +msgstr "Una dependencia en la cola debe tener un origen distinto del destino" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:33 -msgid "Web service reader" -msgstr "Lectura de servicios web" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:29 +msgid "Pending" +msgstr "Pendiente" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:34 -msgid "Web service writer" -msgstr "Escritura de servicios web" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31 +msgid "Failed sent" +msgstr "Fallo en el envío" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:35 -msgid "All orders read allowed" -msgstr "Permitida lectura de todos los pedidos" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:32 +msgid "Success sent" +msgstr "Éxito en el envío" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:36 -msgid "All orders edition allowed" -msgstr "Permitida edición de todos los pedidos" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:27 +msgid "Finished" +msgstr "Terminado" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:37 -msgid "Order creation allowed" -msgstr "Permitida creación de pedidos" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:28 +msgid "In progress" +msgstr "En progreso" -msgid "Add measure" -msgstr "Añadir medida" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:30 +msgid "Blocked" +msgstr "Bloqueado" + +#~ msgid "Company Scheduling" +#~ msgstr "Planificación de la compañía" + +#~ msgid "Scheduling progress per order" +#~ msgstr "Progreso de la planificación por pedido" + +#~ msgid "Edit type of work hour" +#~ msgstr "Editar tipo de horas de trabajo" + +#~ msgid "List quality forms" +#~ msgstr "Lista de formularios de calidad" + +#~ msgid "Orders List" +#~ msgstr "Lista de pedidos" + +#~ msgid "Edit virtual resource" +#~ msgstr "Editar recurso virtual" + +#~ msgid "Manage cost categories" +#~ msgstr "Administrar categorías de coste" + +#~ msgid "General resource allocation" +#~ msgstr "Asignación de recursos general" + +#~ msgid "Work report query" +#~ msgstr "Consulta de partes de trabajo" + +#~ msgid "Create virtual resource" +#~ msgstr "Crear recurso virtual" + +#~ msgid "Label types" +#~ msgstr "Tipos de etiqueta" + +#~ msgid "Manage criteria" +#~ msgstr "Gestionar criterios" + +#~ msgid "Name name" +#~ msgstr "Nombre nombre" + +#~ msgid "Apply filtering to machines satisfying required criteria" +#~ msgstr "" +#~ "Aplicar filtrado a las máquinas que satisfacen los criterios requeridos" + +#~ msgid "Edit worker" +#~ msgstr "Editar trabajador" + +#~ msgid "Hours of day" +#~ msgstr "Horas del día" + +#~ msgid "Could not save new criterion" +#~ msgstr "No se pudo guardar el nuevo criterio" + +#~ msgid "Edit unit type data" +#~ msgstr "Editar datos del tipo de unidad" + +#~ msgid "Type of work hours listing" +#~ msgstr "Listado de tipos de horas de trabajo" + +#~ msgid "List label types" +#~ msgstr "Listar tipos de etiqueta" + +#~ msgid "Unit types" +#~ msgstr "Tipos de unidad" + +#~ msgid "Criterion saved" +#~ msgstr "Criterio guardado" + +#~ msgid "NavalPlan: Scheduling progress report" +#~ msgstr "NavalPlan: Informe de progreso de planificación" + +#~ msgid "Manage external companies" +#~ msgstr "Administrar empresas externas" + +#~ msgid "Overall Resources Load" +#~ msgstr "Carga global de recursos" + +#~ msgid "Work report types" +#~ msgstr "Tipos de partes de trabajo" + +#~ msgid "Completed estimated hours" +#~ msgstr "Horas estimadas completadas" + +#~ msgid "Manage user accounts" +#~ msgstr "Administrar cuentas de usuario" + +#~ msgid "Manage scenarios" +#~ msgstr "Gestionar escenarios" + +#~ msgid "Edit external company" +#~ msgstr "Editar empresa externas" + +#~ msgid "Report advances" +#~ msgstr "Notificar avances" + +#~ msgid "Limiting resources" +#~ msgstr "Recursos limitantes" + +#~ msgid "NavalPlan: Work report admin query" +#~ msgstr "NavalPlan: Consulta de administración de partes de trabajo" + +#~ msgid "Work report listing" +#~ msgstr "Listado de partes de trabajo" + +#~ msgid "NavalPlan: Type of work hours" +#~ msgstr "NavalPlan: Tipo de horas de trabajo" + +#~ msgid "External companies listing" +#~ msgstr "Listado de empresas externas" + +#~ msgid "Manage user profiles" +#~ msgstr "Administrar perfiles de usuario" + +#~ msgid "NavalPlan: Work report types" +#~ msgstr "NavalPlan: Tipos de partes de trabajo" + +#~ msgid "Hours for an exception day should be greater or equal than zero" +#~ msgstr "" +#~ "Las horas para un día de excepción deben ser mayores o iguales que cero" + +#~ msgid "NavalPlan: External companies" +#~ msgstr "NavalPlan: Empresas externas" + +#~ msgid "NavalPlan: Timeline material report" +#~ msgstr "NavalPlan: Informe de materiales a lo largo del tiempo" + +#~ msgid "Workers list" +#~ msgstr "Lista de trabajadores" + +#~ msgid "Manage types of work hours" +#~ msgstr "Administrar tipos de horas de trabajo" + +#~ msgid "Machines list" +#~ msgstr "Lista de máquinas" + +#~ msgid "Manage advance types" +#~ msgstr "Gestionar tipos de avance" #~ msgid "should select a advance type" #~ msgstr "debe seleccionar un tipo de avance" -#~ msgid "Filter by criteria" -#~ msgstr "Filtrar por criterios" - -#~ msgid "Apply filtering to resource load satisfying required criteria" -#~ msgstr "" -#~ "Aplicar filtrado a la carga de recursos que satisfacen los criterios " -#~ "requeridos" - -#~ msgid "Filter by resources" -#~ msgstr "Filtrar por recursos" - #~ msgid "Auto queueing" #~ msgstr "Auto encolar" @@ -6214,7 +6786,7 @@ msgstr "Añadir medida" #~ msgid "subcontractor" #~ msgstr "subcontratista" -#, fuzzy + #~ msgid "Apply filtering to order elements satisfying required critera" #~ msgstr "" #~ "Aplicar filtrado a los elementos de pedido que satisfacen los criterios " @@ -6226,9 +6798,6 @@ msgstr "Añadir medida" #~ msgid "code is used by another machine being imported" #~ msgstr "código usado por otra máquina que está siendo importada" -#~ msgid "Filter by label:" -#~ msgstr "Filtrar por etiqueta:" - #~ msgid "criterion type name is used by another criterion type being imported" #~ msgstr "" #~ "el nombre de tipo de criterio está siendo usado por otro tipo de criterio " @@ -6252,26 +6821,26 @@ msgstr "Añadir medida" #~ msgid "Starting date:" #~ msgstr "Fecha de inicio:" -#, fuzzy + #~ msgid "Status:" #~ msgstr "Estado" -#, fuzzy + #~ msgid "Ending date:" #~ msgstr "Fecha de fin" -#, fuzzy + #~ msgid " Total :" #~ msgstr "Total" #~ msgid "Advance type:" #~ msgstr "Tipo de avance:" -#, fuzzy + #~ msgid "Historical list Assignment" #~ msgstr "Dividir asignación" -#, fuzzy + #~ msgid "Historical assignment" #~ msgstr "Dividir asignación" diff --git a/navalplanner-webapp/src/main/resources/i18n/gl.po b/navalplanner-webapp/src/main/resources/i18n/gl.po index 193063afd..0ddd5f3c8 100644 --- a/navalplanner-webapp/src/main/resources/i18n/gl.po +++ b/navalplanner-webapp/src/main/resources/i18n/gl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-23 11:47+0200\n" +"POT-Creation-Date: 2010-09-07 11:57+0200\n" "PO-Revision-Date: 2010-06-23 13:15+0200\n" "Last-Translator: Jacobo Aragunde Pérez \n" "Language-Team: Galician <>\n" @@ -17,96 +17,121 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:336 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:106 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:116 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:140 + +msgid "This order has already been added." +msgstr "A categoría de coste xa fora borrada." + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:343 msgid "The resource cannot be null" msgstr "O recurso non pode ser nulo" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:386 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:403 msgid "criterion codes must be unique inside a criterion type" msgstr "o código do criterio debe ser único dentro dun tipo de criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:93 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:95 msgid "No authorizations were added because you did not select any." msgstr "Non se engadiron actualizacións porque non se seleccionou ningunha." -#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:63 -#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:73 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 + +msgid "Order Name" +msgstr "Pedido gardado" + +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:69 +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:79 msgid "en" msgstr "gl" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:130 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:129 msgid "Create exception" msgstr "Crear excepción" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:356 +msgid "Up to company view" +msgstr "Arriba á vista da compañía" + #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:45 msgid "Select report data" msgstr "Seleccione data do informe" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:351 -msgid "Up to company view" -msgstr "Arriba á vista da compañía" +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:206 +msgid "there exist multiple resource calendars with name {0}" +msgstr "existen múltiples calendarios de recursos co nome {0}" #: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:58 msgid "Create Virtual Worker" msgstr "Crear traballador virtual" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:205 -msgid "there exist multiple resource calendars with name {0}" -msgstr "existen múltiples calendarios de recursos co nome {0}" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:765 #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:97 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:124 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:148 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:782 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:136 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:69 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:138 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:27 #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:25 #: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:23 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:27 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30 -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:21 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:17 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:25 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:45 #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:37 -#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:28 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:65 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:91 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:75 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:27 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:69 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:136 -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:38 -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:37 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:123 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:165 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:210 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:33 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:100 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:51 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:130 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:38 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:39 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:112 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:153 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:122 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:127 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:101 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:142 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:101 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:97 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:139 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:180 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:128 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:152 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 +#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:28 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:61 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:87 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:36 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:48 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:66 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:36 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:55 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49 #: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:55 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:51 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:112 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:39 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:80 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:124 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:166 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:211 -#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:27 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:75 msgid "Operations" msgstr "Operacións" @@ -114,20 +139,22 @@ msgstr "Operacións" msgid "New order sequence" msgstr "Nova secuencia de pedido" -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:7 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:9 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:27 msgid "Add criterion" msgstr "Engadir criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:130 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:498 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:130 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:194 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:149 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:536 msgid "There is no type of work hours with this code" msgstr "Non hai un tipo de horas de traballo con este código" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:123 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:92 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:81 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:103 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:100 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:135 msgid "Select" msgstr "Seleccionar" @@ -135,24 +162,20 @@ msgstr "Seleccionar" msgid "there must be {0} hours instead of {1}" msgstr "debe haber {0} horas en lugar de {1}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:225 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:36 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:1 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:62 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:251 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:1 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:52 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:137 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:49 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:21 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:64 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:33 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:33 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:88 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:49 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:52 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:137 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:21 msgid "Materials" msgstr "Materiais" -#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:21 -msgid "NavalPlan: Virtual workers" -msgstr "NavalPlan: Traballadores virtuais" - #: navalplanner-webapp/src/main/webapp/common/configuration.zul:108 msgid "Order view" msgstr "Vista de pedido" @@ -169,7 +192,7 @@ msgstr "A descrición non pode ser nula ou baleira" msgid "Percentage of consumed budget hours / hours consumed" msgstr "Porcentaxe de horas de presuposto consumidas / horas consumidas" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:78 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:78 msgid "login name not specified" msgstr "nome de usuario non especificado" @@ -181,25 +204,26 @@ msgstr "Administrar campos e etiquetas" msgid "Please, select a calendar" msgstr "Por favor, seleccione un calendario" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:165 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:161 +msgid "Predefined" +msgstr "Predefinido" + +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:164 msgid "Summary" msgstr "Resumo" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:63 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:252 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:65 msgid "Quality Forms" msgstr "Formularios de calidade" -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28 -#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:161 -msgid "Predefined" -msgstr "Predefinido" - #: navalplanner-webapp/src/main/webapp/common/configuration.zul:122 msgid "Order sequences" msgstr "Secuencias de pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:237 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:263 msgid "Reports" msgstr "Informes" @@ -207,7 +231,7 @@ msgstr "Informes" msgid "Criterion requirements" msgstr "Criterios requiridos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:90 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:92 msgid "START_NOT_EARLIER_THAN" msgstr "COMEZAR_NON_ANTES_DE" @@ -223,15 +247,22 @@ msgstr "" msgid "Dedication chart" msgstr "Gráfico de dedicación" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:630 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:667 msgid "Not the same hours group, impossible to update" msgstr "Non están no mesmo grupo de horas, imposible actualizar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:349 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:225 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:140 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:154 + +msgid "Resource Usage" +msgstr "Recursos" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:437 msgid "Remove limiting resource element" msgstr "Borrar elemento de recurso limitante" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:20 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:40 msgid "Active period from" msgstr "Período activo desde" @@ -239,11 +270,11 @@ msgstr "Período activo desde" msgid "hours type :" msgstr "tipo de horas :" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:461 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:494 msgid "Unassign" msgstr "Desasignar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:622 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:648 msgid "incorrect initialization of the advance assignment controller." msgstr "inicialización incorrecta do controlador de asignación de avances." @@ -251,6 +282,11 @@ msgstr "inicialización incorrecta do controlador de asignación de avances." msgid "Manual assignment" msgstr "Asignación manual" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:235 + +msgid "Companies" +msgstr "Vista da compañía" + #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:67 msgid "Quality form items list" msgstr "Lista de elementos do formulario de calidade" @@ -259,12 +295,12 @@ msgstr "Lista de elementos do formulario de calidade" msgid "Name/Code" msgstr "Nome/Código" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:850 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:890 msgid "Create order" msgstr "Crear pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:196 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:228 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:247 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:215 msgid "" "End date is not valid, the new end date must be later the current end date" msgstr "" @@ -274,17 +310,17 @@ msgstr "" msgid "Select print visualization options" msgstr "Seleccione as opcións de impresión da visualización" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:742 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:758 msgid "Hour start" msgstr "Hora de inicio" +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:117 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:31 #: navalplanner-webapp/src/main/webapp/planner/main.zul:52 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:97 msgid "Start" msgstr "Comezo" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:118 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:118 msgid "cost assignment's category not specified" msgstr "categoría da asignación de coste non especificada" @@ -309,11 +345,17 @@ msgstr "" msgid "Filter quality forms by :" msgstr "Filtrar formularios de calidade por :" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:97 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:98 msgid "changing perspective" msgstr "cambio de perspectiva" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:121 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:242 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:31 + +msgid "Transfer Projects Between Scenarios" +msgstr "Transferir pedidos entre escenarios" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:123 msgid "" "Could not add those authorizations to profile {0} because they were already " "present." @@ -333,13 +375,14 @@ msgstr "NavalPlan: Perfís" msgid "NavalPlan: Error" msgstr "NavalPlan: Erro" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:244 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:41 -msgid "Materials needs at date" -msgstr "Necesidades de materiais en data" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:238 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:33 + +msgid "Advance Report" +msgstr "Tipo de avance" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:299 #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:566 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:299 msgid "Indent" msgstr "Indentar" @@ -355,28 +398,28 @@ msgstr "Calendario base \"{0}\" gardado" msgid "Create Order Element" msgstr "Crear elemento de pedido" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31 -msgid "Locations" -msgstr "Ubicacións" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java:90 msgid "The advanceType cannot be modified" msgstr "O tipo de avance non pode ser modificado" +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31 +msgid "Locations" +msgstr "Ubicacións" + #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:70 msgid "New quality form item" msgstr "Novo elemento de formulario de calidade" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:201 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:20 -msgid "Templates list" -msgstr "Lista de modelos" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:49 + +msgid "generic allocation" +msgstr "Asignación de recursos" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:143 msgid "For interpolation at least two stretches are needed" msgstr "Para a interpolación necesítanse alo menos dous tramos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:718 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:727 msgid "Order Code" msgstr "Código de pedido" @@ -384,7 +427,7 @@ msgstr "Código de pedido" msgid "Login name" msgstr "Nome de usuario" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:14 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:34 msgid "Current" msgstr "Actual" @@ -392,15 +435,15 @@ msgstr "Actual" msgid "Machine deleted" msgstr "Máquina borrada" -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:76 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:70 msgid "Dependencies" msgstr "Dependencias" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:196 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:185 msgid "missing code in a calendar exception" msgstr "falta código nunha excepción de calendario" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1099 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1100 msgid "" "there exist criterion satisfactions referring to criterion types not " "applicable to this resource" @@ -408,29 +451,35 @@ msgstr "" "existen criterios satisfeitos que pertencen a tipos de criterio non " "aplicables a este recurso" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:61 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:49 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:63 #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:49 msgid "Criterion Requirement" msgstr "Criterio requirido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:54 -msgid "Company Scheduling" -msgstr "Planificación da compañía" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:60 + +msgid "Minutes" +msgstr "Liñas" #: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:131 msgid "You can not remove a scenario with derived scenarios" msgstr "Non se pode borrar un escenario con escenarios derivados" +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:21 + +msgid "Work Report Types" +msgstr "Tipos de partes de traballo" + #: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:22 msgid "Create new version" msgstr "Crear versión nova" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:221 msgid "Derived" msgstr "Derivado" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:285 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:297 msgid "a disabled resource has enabled subresources" msgstr "un recurso deshabilitado ten subrecursos habilitados" @@ -443,8 +492,8 @@ msgstr "engadir nova asignación de avance" msgid "Client" msgstr "Cliente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:499 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:110 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:109 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:502 msgid "" "there are no resources for required criteria: {0}. So the generic allocation " "can't be added" @@ -452,12 +501,12 @@ msgstr "" "non hai recursos cos criterios solicitados: {0}. Por tanto, non se pode " "engadir a asignación xenérica" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:393 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:428 msgid "work report has not any description value with this field name" msgstr "" "o parte de traballo non ten ningún valor de descrición con ese nome de campo" -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java:146 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java:146 msgid "material category name has to be unique. It is already used" msgstr "o nome da categoría de materiais debe ser único. Xa está en uso" @@ -469,8 +518,14 @@ msgstr "Horas imputadas" msgid "It is not allowed to consolidate advances." msgstr "Non se poden borrar avances consolidados." +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:269 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:41 + +msgid "Project Costs Per Resource" +msgstr "Costes do pedido por recurso" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:413 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:140 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:412 msgid "Confirm deleting this hour cost. Are you sure?" msgstr "Confirmar o borrado deste coste por hora. ¿Está seguro?" @@ -478,8 +533,8 @@ msgstr "Confirmar o borrado deste coste por hora. ¿Está seguro?" msgid "Delete Milestone" msgstr "Borrar fito" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:486 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:737 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:763 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:485 msgid "The order has no scheduled elements" msgstr "O pedido no ten elementos planificados" @@ -503,47 +558,53 @@ msgstr "" msgid "Configure" msgstr "Configurar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:242 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 -msgid "Scheduling progress per order" -msgstr "Progreso da planificación por recurso" - -#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:21 -msgid "Unit type list" -msgstr "Lista de tipos de unidades" - -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:56 #: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:56 msgid "First name" msgstr "Nome" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:228 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:236 msgid "Could not execute print command" msgstr "Non se puido executar o comando de impresión" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:108 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:112 msgid "Complementary text fields" msgstr "Campos de texto complementario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:190 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1161 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:113 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:194 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1173 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:132 #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:282 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:179 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:198 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:691 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:717 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:179 msgid "Confirm deleting {0}. Are you sure?" msgstr "Confirmar o borrado de {0}. ¿Está seguro?" +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:36 + +msgid "Work Reports List" +msgstr "Lista de partes de traballo" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:248 + +msgid "Accounts" +msgstr "Accións" + #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:81 msgid "External code" msgstr "Código externo" -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:46 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:96 + +msgid "Limiting" +msgstr "Recurso limitante" + +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:48 msgid "View" msgstr "Ver" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:521 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:524 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" @@ -552,15 +613,17 @@ msgstr "os recursos por día deben ser non baleiros e maiores que cero" msgid "Version" msgstr "Versión" +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:46 + +msgid "Apply filtering to resources satisfying required criteria" +msgstr "" +"Aplicar filtrado á carga de recursos que satisfai os criterios requeridos" + #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:98 msgid "Up" msgstr "Arriba" -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:23 -msgid "Edit type of work hour" -msgstr "Editar tipo de horas de traballo" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:164 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:183 msgid "" "CriterionType is not valid, it overlaps other criterionSatisfaction with the " "same criterionType" @@ -572,14 +635,10 @@ msgstr "" msgid "Types of work hours" msgstr "Tipos de horas de traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:58 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:126 msgid "EAC" msgstr "EAC" -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:21 -msgid "Virtual workers list" -msgstr "Lista de traballadores virtuais" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:143 msgid "" "Its planning is not in the current scene.\n" @@ -601,22 +660,23 @@ msgstr "Algún tramo ten valores maiores ou iguais có tramo anterior" msgid "Total hours order element" msgstr "Total de horas do elemento de pedido" -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:16 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 +#: navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul:22 + +msgid "NavalPlan: Cost Categories" +msgstr "NavalPlan: Categorías de coste" + #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:68 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:62 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:39 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:59 msgid "End date" msgstr "Data de fin" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:227 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:254 msgid "missing worker code in the work report" msgstr "falta código de traballador nun parte de traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/advances/AdvanceAssignmentPlanningCommand.java:68 -msgid "Advance assignment" -msgstr "Asignación de avance" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:140 msgid "" "Value is not valid, the default max value must be greater than the precision " @@ -625,11 +685,15 @@ msgstr "" "O valor non é válido, o valor máximo por defecto debe ser maior có valor de " "precisión " +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/advances/AdvanceAssignmentPlanningCommand.java:68 +msgid "Advance assignment" +msgstr "Asignación de avance" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:507 msgid "Reassigning {0} orders" msgstr "Reasignando {0} pedidos" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:87 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:87 msgid "profile name is already being used by another profile" msgstr "o nome do perfil xa está a ser usado por outro perfil" @@ -637,64 +701,72 @@ msgstr "o nome do perfil xa está a ser usado por outro perfil" msgid "E-mail" msgstr "Correo electrónico" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:103 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:109 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:99 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:115 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:111 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:121 msgid "Please, select an order" msgstr "Por favor, seleccione un pedido" -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:21 -msgid "List quality forms" -msgstr "Lista de formularios de calidade" - #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:26 msgid "User data" msgstr "Datos do usuario" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:127 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:135 msgid "Resource / Criteria" msgstr "Recurso / Criterios" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:767 -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:41 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:48 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:15 -msgid "Criteria" -msgstr "Criterios" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:46 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:134 msgid "Order Details" msgstr "Detalles de pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:79 -msgid "AS_SOON_AS_POSSIBLE" -msgstr "TAN_PRONTO_COMO_SEXA_POSIBLE" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:256 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:827 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:51 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:45 +msgid "Criteria" +msgstr "Criterios" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:99 msgid "Error setting up creation form." msgstr "Erro preparando o formulario de creación." +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:81 +msgid "AS_SOON_AS_POSSIBLE" +msgstr "TAN_PRONTO_COMO_SEXA_POSIBLE" + #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:43 msgid "Lines" msgstr "Liñas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:44 -msgid "Orders List" -msgstr "Lista de pedidos" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:189 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:190 msgid "Error on showing warning message removing workReportType: " msgstr "" "Erro ao mostrar mensaxe de advertencia borrando tipo de parte de traballo: " +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:601 + +msgid "Edit Work Report" +msgstr "Editar parte de traballo" + +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:21 + +msgid "Quality Forms List" +msgstr "Formularios de calidade" + #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:29 msgid "Personal data" msgstr "Datos persoais" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:210 -msgid "Work reports" -msgstr "Partes de traballo" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:161 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:157 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:183 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:298 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:230 + +msgid "please, select a Criterion" +msgstr "por favor, seleccione un elemento" #: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:41 msgid "Save Order" @@ -708,15 +780,11 @@ msgstr "{0} anotación obrigatoria en {1}" msgid "Modified" msgstr "Modificado" -#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:38 -msgid "Edit virtual resource" -msgstr "Editar recurso virtual" - #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:215 msgid "Add Criterion" msgstr "Engadir criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:212 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:210 msgid "Fattened Tree {0}" msgstr "Árbore aplanada {0}" @@ -724,49 +792,53 @@ msgstr "Árbore aplanada {0}" msgid "You can not remove the current scenario" msgstr "Non se pode borrar o escenario actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:287 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:69 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:88 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:288 msgid "MessagesContainer is needed" msgstr "É necesario un MessagesContainer" -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:43 #: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:68 -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:19 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:39 #: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:23 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60 msgid "Ending date" msgstr "Data de fin" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:227 -msgid "Manage cost categories" -msgstr "Administrar categorías de coste" +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:20 + +msgid "Templates List" +msgstr "Lista de modelos" + +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:33 + +msgid "Subcontracted Tasks List" +msgstr "Lista de tarefas subcontratadas" #: navalplanner-webapp/src/main/webapp/common/configuration.zul:135 msgid "Last value" msgstr "Último valor" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:198 -msgid "General resource allocation" -msgstr "Asignación de recursos xeral" - -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:65 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:67 msgid "Statistics log" msgstr "Histórico de estadísticas" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:46 #: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:39 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:46 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:43 msgid "Edit Calendar" msgstr "Editar calendario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:215 -msgid "Work report query" -msgstr "Consulta de partes de traballo" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:271 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:41 + +msgid "Materials Needs At Date" +msgstr "Necesidades de materiais en data" #: navalplanner-webapp/src/main/webapp/common/configuration.zul:54 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:14 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:20 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:40 msgid "Cannot be empty or null" msgstr "Non pode ser baleiro ou nulo" @@ -778,11 +850,16 @@ msgstr "filtrado" msgid "Total Budget" msgstr "Presuposto total" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:50 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:50 msgid "Hierarchy" msgstr "Xerarquía" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:740 +#: navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:22 + +msgid "NavalPlan: Work Hours" +msgstr "NavalPlan: Parte de traballo" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:748 msgid "" "This worker cannot be deleted because it has assignments to projects or " "imputed hours" @@ -803,39 +880,43 @@ msgstr "Sobrecarga debido a outras asignacións" msgid "Time period saved" msgstr "Período de tiempo gardado" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:39 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:167 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:163 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:189 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:304 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:236 + +msgid "This Criterion has already been added." +msgstr "A categoría de coste xa fora borrada." + +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:40 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:34 msgid "Filter work report by :" msgstr "Filtrar parte de traballo por :" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:103 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:41 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:231 msgid "Workers" msgstr "Traballadores" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:49 -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 msgid "Order element code" msgstr "Código do elemento de pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:109 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:323 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:109 msgid "Advance measurements: " msgstr "Medidas de avance: " -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:22 -msgid "NavalPlan: Work report" -msgstr "NavalPlan: Parte de traballo" - #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:54 msgid "Year" msgstr "Ano" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:66 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:66 msgid "profile name not specified" msgstr "nome do perfil non especificado" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:60 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:61 msgid "Date Start" msgstr "Data de inicio" @@ -847,10 +928,10 @@ msgstr "O valor non é válido, o valor actual debe ser menor que o valor máxim msgid "From Chosen" msgstr "A partir de elixidos" -#: navalplanner-webapp/src/main/webapp/planner/order.zul:132 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:63 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:34 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:55 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:63 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:92 msgid "Value" msgstr "Valor" @@ -858,25 +939,34 @@ msgstr "Valor" msgid "Hour costs" msgstr "Costes por hora" +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:40 +msgid "Edit Scenario" +msgstr "Editar escenario" + #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:76 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:52 msgid "Add role" msgstr "Engadir rol" -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:40 -msgid "Edit Scenario" -msgstr "Editar escenario" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:489 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:922 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:504 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:926 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" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:703 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:742 msgid "Duplicate advance assignment for order element " msgstr "Asignación de avance duplicada no elemento de pedido" +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:130 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:146 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:119 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:157 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:117 + +msgid "Filter by criterions" +msgstr "Filtrar por criterios" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:402 msgid "" "The {0} can not be assigned to this resource. Its interval overlaps with " @@ -889,11 +979,11 @@ msgstr "" msgid "Work done until ending date:" msgstr "Traballo realizado ata a data de fin:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:63 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:131 msgid "Schedule Performance Index" msgstr "Índice de rendemento da planificación" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:128 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136 msgid "Earlier starting date" msgstr "Data de inicio máis cedo" @@ -901,40 +991,46 @@ msgstr "Data de inicio máis cedo" msgid "Type data" msgstr "Datos do tipo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:502 -msgid "Create virtual resource" -msgstr "Crear recurso virtual" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:249 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:224 -msgid "Label types" -msgstr "Tipos de etiqueta" +msgid "Profiles" +msgstr "Perfil gardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:349 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:356 msgid "The order element code cannot be null" msgstr "O código do elemento de pedido non pode ser nulo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:746 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:762 msgid "Hour finish" msgstr "Hora de fin" +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:39 + +msgid "Edit Work Report Type" +msgstr "Tipos de partes de traballo" + #: navalplanner-webapp/src/main/webapp/common/layout/template.zul:103 msgid "Perspectives" msgstr "Perspectivas" +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:67 +msgid "Workable time" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:239 msgid "missing code in a subcategory" msgstr "falta código nunha subcategoría" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:426 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:427 msgid "Confirm deleting this cost category. Are you sure?" msgstr "Confirmar o borrado desta categoría de coste. ¿Está seguro?" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:30 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:73 +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:64 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:34 msgid "Non limiting resource allocation" msgstr "Asignación de recursos non limitantes" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:189 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:191 msgid "Error removing element: " msgstr "Erro ao borrar elemento: " @@ -942,8 +1038,8 @@ msgstr "Erro ao borrar elemento: " msgid "Company name" msgstr "Nome da empresa" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:32 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:74 +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:65 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:36 msgid "Limiting resource allocation" msgstr "Asignación de recursos limitantes" @@ -955,13 +1051,13 @@ msgstr "{0}" msgid "Split new assignment" msgstr "Dividir nova asignación" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:164 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:210 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:163 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:209 msgid "Expiry date" msgstr "Data de vencemento" +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:66 #: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:52 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:58 msgid "Pagination" msgstr "Paxinación" @@ -969,19 +1065,30 @@ msgstr "Paxinación" msgid "Change scenario" msgstr "Cambiar escenario" -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:42 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:38 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:41 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:71 msgid "Categories" msgstr "Categorías" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:110 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:125 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:143 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:114 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:146 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:120 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:110 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:181 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:128 + +msgid "Project Details" +msgstr "Detalles de pedido" + +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:35 + +msgid "Create Criterion Type" +msgstr "Crear período de activación" + +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:196 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:225 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182 msgid " to go to output directly" msgstr " ir á saída directamente" @@ -989,23 +1096,19 @@ msgstr " ir á saída directamente" msgid "Add new hours group" msgstr "Engadir novo grupo de horas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:210 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:214 msgid "Criteria: {0} " msgstr "Criterios: {0} " #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:364 -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:62 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:133 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:64 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:93 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:79 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:62 msgid "Percentage" msgstr "Porcentaxe" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:222 -msgid "Manage criteria" -msgstr "Xestionar criterios" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:134 msgid "Updated" msgstr "Actualizado" @@ -1023,66 +1126,82 @@ msgstr "Número de díxitos" msgid "Total capability" msgstr "Capacidade total" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:834 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:877 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:508 +msgid "Advance" +msgstr "Avance" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:232 msgid "Problems connecting with client web service" msgstr "Problemas conectando co servizo web cliente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:502 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:834 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:774 -msgid "Advance" -msgstr "Avance" - #: navalplanner-webapp/src/main/webapp/common/layout/login.zul:20 msgid "NavalPlan: User access" msgstr "NavalPlan: Acceso de usuarios" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:93 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:122 -msgid "Exception Type" -msgstr "Tipo de excepción" - -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:21 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:21 -msgid "NavalPlan: Subcontracted tasks" -msgstr "NavalPlan: Tarefas subcontratadas" - #: navalplanner-webapp/src/main/webapp/materials/materials.zul:21 msgid "NavalPlan: Materials" msgstr "NavalPlan: Materiais" +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:93 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:121 +msgid "Exception Type" +msgstr "Tipo de excepción" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:202 msgid "Advances sent successfully" msgstr "Os avances enviáronse con éxito" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:215 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:512 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:846 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:754 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:60 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:47 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:45 -msgid "Labels" -msgstr "Etiquetas" +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:21 + +msgid "Profiles List" +msgstr "Listado de perfís" #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:243 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/common/CustomMenuController.java:257 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:216 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:814 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:889 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:518 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:62 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:45 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:67 +msgid "Labels" +msgstr "Etiquetas" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1229 msgid "Calculated advances measurement can not be removed" msgstr "As medidas de avance calculadas non se poden borrar" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:254 + +msgid "Data Types" +msgstr "Tipos de unidade" + #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:147 msgid "Total hours" msgstr "Total de horas" -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:66 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:74 + +msgid "Create Work Hours Type" +msgstr "Crear novo tipo de parte de traballo" + +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:59 msgid "Filter by task status" msgstr "Filtrar por estado da tarefa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:360 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:21 + +msgid "NavalPlan: Advance Report" +msgstr "NavalPlan: Tipos de avance" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:406 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:518 msgid "Select date:" msgstr "Seleccione data:" @@ -1095,8 +1214,8 @@ msgstr "Usuario integrado" msgid "Value last advance reported" msgstr "Valor último avance notificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:482 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:915 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:497 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:919 msgid "You should select a end date for the exception" msgstr "Debe seleccionar unha data de fin para a excepción" @@ -1112,53 +1231,59 @@ msgstr "Código da empresa" msgid "Unknown attribute '{0}' in class {1}" msgstr "Atributo descoñecido '{0}' na clase {1}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:649 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:650 msgid "NON LIMITING RESOURCE" msgstr "RECURSO NON LIMITANTE" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java:96 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java:96 msgid "machine name not specified" msgstr "nome da máquina non especificado" +#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:21 + +msgid "NavalPlan: Workers" +msgstr "NavalPlan: Parte de traballo" + #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:77 msgid "Activation periods" msgstr "Períodos de activación" -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:23 -msgid "Edit cost category" -msgstr "Editar categoría de coste" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:368 msgid "Passed" msgstr "Pasado" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:174 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:87 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:127 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:174 msgid "already assigned" msgstr "xa asignado" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:33 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:33 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:123 msgid "Calendar" msgstr "Calendario" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:84 + +msgid "{0}h" +msgstr "{0}" + #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:30 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:55 msgid "Read" msgstr "Leer" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:205 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:230 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:81 msgid "Resources" msgstr "Recursos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:154 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:152 msgid "Source and destination scenarios should be different" msgstr "Os escenarios de orixe e destino deben ser diferentes" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:243 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:241 msgid "CriterionType and its criteria saved" msgstr "Tipo de criterio e os seus criterios gardados" @@ -1166,21 +1291,26 @@ msgstr "Tipo de criterio e os seus criterios gardados" msgid "scenario" msgstr "escenario" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:42 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:187 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:50 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:49 -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:22 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:9 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:8 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:188 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:28 msgid "to" msgstr "a" -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:43 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:86 + +msgid " {0}m" +msgstr "{0}" + #: navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul:43 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:43 msgid "<<" msgstr "<<" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:106 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:105 msgid "worker's first name not specified" msgstr "nome do traballador non especificado" @@ -1188,14 +1318,15 @@ msgstr "nome do traballador non especificado" msgid "date not specified" msgstr "data non especificada" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:93 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:94 msgid "Select type :" msgstr "Seleccione tipo :" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:59 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:255 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:48 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:45 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:61 #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:43 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:45 msgid "Advances" msgstr "Avances" @@ -1203,11 +1334,23 @@ msgstr "Avances" msgid "Shrink to fit page width" msgstr "Reducir para axustar ao ancho de páxina" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:224 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:261 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:271 + +msgid "Projects Planning" +msgstr "Listado de perfís" + #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:66 msgid "Last name" msgstr "Apelidos" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:252 +#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:21 + +msgid "NavalPlan: Virtual Workers Groups" +msgstr "NavalPlan: Traballadores virtuais" + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:253 msgid "cost category name not specified" msgstr "nome da categoría de coste non especificado" @@ -1216,36 +1359,20 @@ msgstr "nome da categoría de coste non especificado" msgid "Remove" msgstr "Borrar" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:21 -msgid "NavalPlan: Templates" -msgstr "NavalPlan: Plantillas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:62 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130 msgid "SPI" msgstr "SPI" -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:47 -msgid "Name name" -msgstr "Nome nome" - -#: navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul:22 -msgid "NavalPlan: Cost categories" -msgstr "NavalPlan: Categorías de coste" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:163 -msgid "Edit quality form" -msgstr "Editar formulario de calidade" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1343 msgid "Interpolation" msgstr "Interpolación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:310 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:313 msgid "{0} must not be before {1}" msgstr "{0} non debe estar antes de {1}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:220 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:205 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:224 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:239 msgid "" "Start date is not valid, the new start date must be previous the current " "start date" @@ -1253,7 +1380,7 @@ msgstr "" "A data de inicio non é válida, a data de inicio nova debe ser anterior data " "de inicio actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:377 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:376 msgid "the code must be not null or not empty" msgstr "o código non pode ser nulo ou baleiro" @@ -1261,67 +1388,58 @@ msgstr "o código non pode ser nulo ou baleiro" msgid "Stretches list" msgstr "Lista de tramos" -#: navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:21 -msgid "NavalPlan: QualityForms" -msgstr "NavalPlan: Formularios de calidade" - -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:51 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:59 msgid "Zoom" msgstr "Zoom" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:506 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:210 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:36 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:40 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:169 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:84 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:146 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:84 #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:47 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:36 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:36 #: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:38 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:91 #: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:40 #: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:39 #: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:91 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100 -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:39 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:123 -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:37 -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:40 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:104 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:146 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:126 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:45 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:40 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:44 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:128 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:36 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:40 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:211 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:169 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:38 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:116 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:135 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:80 #: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:37 #: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:41 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:124 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:40 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:44 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:135 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:80 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:37 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:40 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:104 msgid "Save" msgstr "Gardar" -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:21 -msgid "NavalPlan: AdvanceTypes" -msgstr "NavalPlan: Tipos de avance" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:795 + +msgid "Sorry, you do not have permissions to access this order" +msgstr "Non ten permisos para editar este pedido" #: navalplanner-webapp/src/main/webapp/common/configuration.zul:87 msgid "Material categories" msgstr "Categorías de materiais" -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39 -msgid "Edit advance type data" -msgstr "Editar datos do tipo de avance" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:131 msgid "Pending update" msgstr "Actualización pendente" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:59 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:67 msgid "End date:" msgstr "Data de fin:" @@ -1337,24 +1455,15 @@ msgid "" msgstr "" "O valor non é válido, o valor debe ser maior có valor dos avances previos." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:296 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:303 msgid "Order Element code cannot be null" msgstr "O código do elemento de pedido non pode ser nulo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:243 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41 -msgid "Task scheduling status for an order" -msgstr "Estado das tarefas de planificacion dun pedido" - -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:62 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:50 msgid "Users authorization" msgstr "Autorización de usuarios" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:334 -msgid "Assign element to queue manually" -msgstr "Asignar elemento á cola manualmente" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:171 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:172 msgid "Problems connecting with subcontractor web service" msgstr "Problemas conectando co servizo web subcontratista" @@ -1362,20 +1471,19 @@ msgstr "Problemas conectando co servizo web subcontratista" msgid "Assigned load" msgstr "Carga asignada" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:68 -msgid "Filter by workers" -msgstr "Filtrar por traballadores" - #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:106 msgid "End Date" msgstr "Data de fin" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:76 +msgid "Filter by workers" +msgstr "Filtrar por traballadores" + +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:111 msgid "Resources Per Day" msgstr "Recursos por día" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:201 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:167 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:201 msgid "ResourceType must be not-null" msgstr "ResourceType non debe ser nulo" @@ -1395,7 +1503,7 @@ msgstr "Expandir/Pregar todo" msgid "Move down" msgstr "Mover abaixo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:501 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:507 msgid "Name: {0}" msgstr "Nome: {0}" @@ -1403,33 +1511,25 @@ msgstr "Nome: {0}" msgid "Report structure" msgstr "Estrutura do parte" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:87 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:87 msgid "password not specified" msgstr "contrasinal non especificado" -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:49 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:56 msgid "Yes" msgstr "Si" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:116 #: navalplanner-webapp/src/main/webapp/templates/templates.zul:57 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:117 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:39 msgid "General data" msgstr "Datos xerais" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:57 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 msgid "BAC" msgstr "BAC" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:26 -msgid "Apply filtering to machines satisfying required criteria" -msgstr "Aplicar filtrado ás máquinas que satisfán os criterios requeridos" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:379 -msgid "Calculate Number of Hours" -msgstr "Calcular número de horas" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1301 msgid "" "This advance measurement can not be in current date, because it is " @@ -1438,11 +1538,15 @@ msgstr "" "Esta medida de avance non pode estar na data actual, porque está " "consolidada. Débese seleccionar outra data." +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:384 +msgid "Calculate Number of Hours" +msgstr "Calcular número de horas" + #: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:37 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:179 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:80 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:34 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:139 msgid "Assign" msgstr "Asignar" @@ -1450,17 +1554,38 @@ msgstr "Asignar" msgid "missing code in a criterion" msgstr "falta código nun criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:657 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1057 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:717 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1087 #: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:39 msgid "Create Template" msgstr "Crear modelo" +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:22 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:22 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:22 + +msgid "NavalPlan: Work Reports" +msgstr "NavalPlan: Parte de traballo" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:168 msgid "Advance type saved" msgstr "Tipo de avance gardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:601 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:101 + +msgid "Edit Company" +msgstr "Editar máquina" + +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:89 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:78 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:116 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:78 + +msgid "Filter by labels" +msgstr "Filtrar por etiqueta:" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:621 msgid "" "IMPORTANT: Don't forget to communicate to subcontractor that his contract " "has been cancelled" @@ -1468,41 +1593,34 @@ msgstr "" "IMPORTANTE: Non olvide comunicar ao subcontratista que o seu contrato foi " "cancelado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:57 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:21 + +msgid "NavalPlan: Hours Worked Per Resource" +msgstr "NavalPlan: Informe de horas traballadas" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 msgid "Schedule Variance" msgstr "Desviación en planificación" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:414 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:409 msgid "Service does not manage resource of type: {0}" msgstr "O servizo non xestiona recursos de tipo: {0}" -#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:39 -msgid "Edit worker" -msgstr "Editar traballador" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:187 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:188 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:553 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:591 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:622 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1258 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:533 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:571 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:602 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:57 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:57 msgid "Warning" msgstr "Advertencia" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:34 #: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:34 msgid "Select parent calendar" msgstr "Seleccionar o calendario pai" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:67 -msgid "Hours of day" -msgstr "Horas do día" - -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21 -msgid "NavalPlan: Task scheduling status report" -msgstr "NavalPlan: Informe de estado de planificación" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:297 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:297 msgid "criterion satisfaction with end date less than start date" msgstr "o criterio satisfeito ten data de fin anterior á de inicio" @@ -1522,13 +1640,14 @@ msgstr "Duración (días)" msgid "Assignment Type" msgstr "Tipo de asignación" -#: navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/resources_use.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/index.zul:21 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:21 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:21 +#: navalplanner-webapp/src/main/webapp/planner/resources_use.zul:21 #: navalplanner-webapp/src/main/webapp/planner/order.zul:21 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:21 +#: navalplanner-webapp/src/main/webapp/planner/index.zul:21 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:21 +#: navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul:21 msgid "NavalPlan: Scheduling" msgstr "NavalPlan: planificación" @@ -1541,26 +1660,32 @@ msgstr "Volver a iniciar sesión" msgid "Error on splitting" msgstr "Erro ao dividir" -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:20 -msgid "NavalPlan: Unit types" -msgstr "NavalPlan: Tipos de unidades" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:45 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:65 msgid "Node without children" msgstr "Nodo sen fillos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:134 -msgid "Profile saved" -msgstr "Perfil gardado" +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:117 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:201 +msgid "There is no label with this code " +msgstr "Non hai ningún elemento de pedido con este código" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:205 msgid "Task: {0} " msgstr "Tarefa: {0} " -#: navalplanner-webapp/src/main/webapp/planner/order.zul:72 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:136 +msgid "Profile saved" +msgstr "Perfil gardado" + +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:63 msgid "Task properties" msgstr "Propiedades da tarefa" +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:74 + +msgid "There is no type of work report with this code" +msgstr "Non hai un tipo de horas de traballo con este código" + #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:27 #: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:33 msgid "Surname" @@ -1570,35 +1695,31 @@ msgstr "Apelidos" msgid "You need to select some function to configure" msgstr "Necesita seleccionar algunha función para configurar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:694 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:372 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:155 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:67 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:115 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:48 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:134 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:8 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:44 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:65 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:73 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 -msgid "Date" -msgstr "Data" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:362 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:361 msgid "the name must be not null or not empty" msgstr "o nome non pode ser nulo ou baleiro" -#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:21 -msgid "NavalPlan: Resources" -msgstr "NavalPlan: Recursos" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:703 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:372 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:156 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:67 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:115 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:65 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:73 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:28 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:94 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:48 +msgid "Date" +msgstr "Data" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:532 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:570 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:552 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:590 msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "Os recursos asignados para esta tarefa serán borrados. Está seguro?" @@ -1612,13 +1733,13 @@ msgstr "Imputación de liñas de pedido" msgid "Advance assignments" msgstr "Asignaciones de avances" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:336 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:339 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:358 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:355 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:319 msgid "The criterion and its type cannot be null" msgstr "O criterio e o seu tipo non poden ser nulos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:211 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" @@ -1626,14 +1747,10 @@ msgstr "O código non é válido. Hai outro tipo de unidade co mesmo código" msgid "( max: {0} )" msgstr "( máx: {0} )" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:204 msgid "Error on removing element: " msgstr "Erro ao borrar elemento: " -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:33 -msgid "Select queue" -msgstr "Seleccionar cola" - #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:63 msgid "Cannot calculate charts for current data" msgstr "Non se poden calcular gráficos para os datos actuais" @@ -1642,21 +1759,25 @@ msgstr "Non se poden calcular gráficos para os datos actuais" msgid "Found workers" msgstr "Traballadores atopados" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:464 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:53 +msgid "Select queue" +msgstr "Seleccionar cola" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:465 msgid "The cost category had already been removed." msgstr "A categoría de coste xa fora borrada." -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:27 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:47 msgid "Work description" msgstr "Descrición do traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:524 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:556 msgid "Order element {0} : Order is incompatible type with {1}" msgstr "Elemento de pedido {0} : O pedido ten un tipo incompatible con {1}" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:38 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:43 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:64 msgid "Split assignment" msgstr "Dividir asignación" @@ -1668,32 +1789,29 @@ msgstr "Non se pode borrar o escenario por defecto, chamado \"{0}\"" msgid "Down" msgstr "Abaixo" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:109 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:124 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:142 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:113 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:145 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:119 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:109 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:195 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:165 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:209 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:184 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:162 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:224 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181 msgid "direct link" msgstr "enlace directo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:928 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:37 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:36 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:931 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:75 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:47 msgid "Label" msgstr "Etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:241 -msgid "Order costs per resource" -msgstr "Costes do pedido por recurso" - #: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:36 msgid "Create Scenario" msgstr "Crear Escenario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:605 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:665 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" @@ -1702,11 +1820,10 @@ msgstr "O valor non é válido, tendo en conta a lista actual de HoursGroup" msgid "Association with roles" msgstr "Asociación con roles" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:351 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:384 msgid "missing type of work hours in a work report line" msgstr "falta tipo de horas de traballo nunha liña do parte" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:230 #: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:29 msgid "Quality forms" msgstr "Formularios de calidade" @@ -1716,57 +1833,58 @@ msgid "Hours group" msgstr "Grupo de horas" #: navalplanner-webapp/src/main/webapp/templates/_list.zul:29 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:92 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:94 msgid "Days from Beginning to Deadline" msgstr "Días desde o comezo ata a data límite" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:59 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:127 msgid "Estimate At Completion" msgstr "Estimación de coste total actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:196 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:329 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:197 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:353 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:329 msgid "Delete item. Are you sure?" msgstr "Borrar elemento. ¿Está seguro?" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:219 -msgid "Edit machine" -msgstr "Editar máquina" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:27 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:46 msgid "Indirect" msgstr "Indirecto" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:101 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:101 msgid "cost assignment's start date not specified" msgstr "data de inicio da asignación de coste non especificada" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:48 -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:34 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java:46 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:42 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:34 msgid "Order code" msgstr "Código de pedido" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:95 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:108 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:99 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:105 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:95 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:181 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:197 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:170 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:208 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:167 msgid "Output format:" msgstr "Formato de saída:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:25 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:44 msgid "Direct" msgstr "Directo" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:780 +msgid "Op." +msgstr "" + #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:55 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55 msgid "Reference date:" msgstr "Data de referencia:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:407 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:420 msgid "Limiting resource assignation" msgstr "Asignación de recursos limitantes" @@ -1778,25 +1896,20 @@ msgstr "Semana de traballo" msgid "You will lose the changes. Are you sure?" msgstr "Perderanse os cambios. ¿Está seguro?" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:162 -msgid "Unit type name cannot be empty" -msgstr "O nome do tipo de unidade non pode ser baleiro" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:199 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:21 msgid "Orders list" msgstr "Lista de pedidos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:208 -msgid "Virtual worker groups" -msgstr "Grupos virtuais de traballadores" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:183 +msgid "Unit type name cannot be empty" +msgstr "O nome do tipo de unidade non pode ser baleiro" #: navalplanner-webapp/src/main/webapp/templates/_list.zul:27 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:87 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:89 msgid "Delay from beginning (days)" msgstr "Retraso desde o comezo (en días)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:289 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:296 msgid "Resource cannot be null" msgstr "O recurso non pode ser nulo" @@ -1804,11 +1917,12 @@ msgstr "O recurso non pode ser nulo" msgid "Do you want to delete " msgstr "¿Quere borrar " +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:511 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:34 msgid "Total Hours" msgstr "Horas totais" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:71 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:127 msgid "All orders" msgstr "Todos os pedidos" @@ -1820,19 +1934,25 @@ msgstr "Confirmar cancelación" msgid "Label list" msgstr "Lista de etiquetas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1169 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:290 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:267 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 + +msgid "Work And Progress Per Task" +msgstr "Progreso de traballo por tarefa" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:421 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:435 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:147 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:420 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:434 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1181 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:290 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:261 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:206 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:699 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:185 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:725 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:187 msgid "Error on showing removing element: " msgstr "Erro ao mostrar o elemento a borrar: " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:85 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:87 msgid "start not earlier than" msgstr "empezar non antes de" @@ -1842,10 +1962,20 @@ msgstr "empezar non antes de" msgid "Select scenario" msgstr "Seleccionar escenario" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:205 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:137 + +msgid "Create Label Type" +msgstr "Crear tipo de etiqueta" + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:232 msgid "missing work report code in a work report" msgstr "falta o código nun parte de traballo" +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:35 + +msgid "Create Work Report Type" +msgstr "Crear novo tipo de parte de traballo" + #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 msgid "Criterion requirement" msgstr "Criterios requiridos" @@ -1862,7 +1992,6 @@ msgstr "" msgid "PDF" msgstr "PDF" -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75 #: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:45 #: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:47 #: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:69 @@ -1873,37 +2002,33 @@ msgstr "Pedidos" msgid "Type resource assignation" msgstr "Asignación de tipos de recursos" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:318 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:148 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:297 msgid "Scheduling saved" msgstr "Planificación gardada" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:196 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:155 -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:6 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:57 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:26 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:197 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:155 msgid "Add new row" msgstr "Engadir nova fila" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:468 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:501 msgid "Move" msgstr "Mover" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:222 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:223 msgid "missing code in the resource calendar" msgstr "falta código no calendario de recursos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:138 -msgid "Could not save new criterion" -msgstr "Non se puido gardar o novo criterio" - #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:33 #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:33 msgid "Overload" msgstr "Sobrecarga" +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:66 #: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:29 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:64 msgid "Assignment log" msgstr "Histórico de asignacións" @@ -1919,11 +2044,7 @@ msgstr "Carga debido ao pedido actual" msgid "Deadline (days since beggining project)" msgstr "Data límite (días desde o inicio do proxecto)" -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:38 -msgid "Edit unit type data" -msgstr "Editar datos do tipo de unidade" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:390 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:397 msgid "number of hours is not properly calculated based on clock" msgstr "número de horas non calculado correctamente basado en reloxo" @@ -1931,11 +2052,11 @@ msgstr "número de horas non calculado correctamente basado en reloxo" msgid "Value is not valid, the type must be not empty" msgstr "O valor non é válido, o tipo non pode estar baleiro" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:411 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:428 msgid "criterion type name is already being used" msgstr "o nome de tipo de criterio está sendo usado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:436 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:453 msgid "Could not get order code, please try again later" msgstr "" "Non se puido obter o código de pedido, por favor volva intentalo máis tarde" @@ -1944,43 +2065,48 @@ msgstr "" msgid "worker" msgstr "traballador" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:102 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:134 + +msgid "Edit Cost Category" +msgstr "Editar categoría de coste" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:100 msgid "Error setting up creation form for Criterion Type" msgstr "Erro preparando o formulario de creación para un tipo de criterio" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:6 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44 -msgid "External company" -msgstr "Empresa externa" - -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:64 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30 #: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:26 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:65 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:43 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:82 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:112 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:26 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:58 #: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:27 msgid "Actions" msgstr "Accións" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:145 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:26 +msgid "External company" +msgstr "Empresa externa" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:149 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java:72 msgid "New order element" msgstr "Novo elemento de pedido" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:75 -msgid "Exceptions" -msgstr "Excepcións" - #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:71 msgid "Start hour" msgstr "Hora de inicio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:847 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:75 +msgid "Exceptions" +msgstr "Excepcións" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:907 msgid "" "You can not remove the order element \"{0}\" because of this or any of its " "children are already in use in some work reports" @@ -1988,19 +2114,18 @@ msgstr "" "Non se pode borrar o elemento de pedido \"{0}\" porque algún dos seus fillos " "está a usarse nalgún parte de traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:201 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:225 msgid "format filters are not valid" msgstr "o formato dos filtros non é válido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:496 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:528 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:746 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:781 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:548 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:772 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:495 msgid "You don't have read access to this order" msgstr "Non ten acceso de lectura a este pedido" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:305 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:178 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:304 msgid "The init date cannot be empty" msgstr "A data de inicio non pode ser baleira" @@ -2012,19 +2137,20 @@ msgstr "criterio" msgid "Our company password" msgstr "Contrasinal da nosa empresa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:194 -msgid "Create machine" -msgstr "Crear máquina" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:133 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:129 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:155 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:274 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:202 + +msgid "This label has already been added." +msgstr "A categoría de coste xa fora borrada." #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:46 msgid "A2" msgstr "A2" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:21 -msgid "Criterion type list" -msgstr "Lista de tipos de criterio" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:381 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:380 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_'." @@ -2040,7 +2166,7 @@ msgstr "Confirmar o borrado desta máquina. ¿Está seguro?" msgid "Hours Group" msgstr "Grupo de horas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:909 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:912 msgid "Unallocated name" msgstr "Nome no asignado" @@ -2048,22 +2174,24 @@ msgstr "Nome no asignado" msgid "Move up" msgstr "Mover arriba" -#: navalplanner-webapp/src/main/webapp/planner/order.zul:113 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:120 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:73 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:80 msgid "Advance Consolidation" msgstr "Consolidación de avance" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:55 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:123 msgid "BCWP" msgstr "BCWP" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:42 msgid "Subcontract communication date" msgstr "Data de comunicación da subcontratación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:196 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:259 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:120 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:286 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:268 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:109 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:121 msgid "Scheduling" msgstr "Planificación" @@ -2075,12 +2203,7 @@ msgstr "As dependencias teñen prioridade" msgid "Nif" msgstr "Nif" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:204 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:31 -msgid "Transfer orders between scenarios" -msgstr "Transferir pedidos entre escenarios" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:58 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:126 msgid "Budget At Completion" msgstr "Total coste planificado" @@ -2088,18 +2211,10 @@ msgstr "Total coste planificado" msgid "Assign Label" msgstr "Asignar etiqueta" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:63 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:71 msgid "Page up" msgstr "Páxina arriba" -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:21 -msgid "Type of work hours listing" -msgstr "Listado de tipos de horas de traballo" - -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:21 -msgid "List label types" -msgstr "Listar tipos de etiqueta" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:511 msgid "{0} orders reassignation remaining" msgstr "quedan {0} reasignacións de pedidos" @@ -2108,13 +2223,14 @@ msgstr "quedan {0} reasignacións de pedidos" 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:509 -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:20 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:24 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:515 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50 #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:151 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:40 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:151 msgid "State" msgstr "Estado" @@ -2130,17 +2246,23 @@ msgstr "Confirmar cambio" msgid "Single image" msgstr "Imaxe simple" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:201 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:102 + +msgid "Edit Profile" +msgstr "Editar perfil" + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:190 msgid "missing date in a calendar exception" msgstr "falta a data nunha excepción de calendario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:445 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:460 msgid "Exception" msgstr "Excepción" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:226 -msgid "Unit types" -msgstr "Tipos de unidades" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:270 + +msgid "Create new order from template" +msgstr "Crear pedido a partir de modelo" #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:191 #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:194 @@ -2159,16 +2281,16 @@ msgstr "O contrasinal non pode ser baleiro para un usuario novo" msgid "Type name" msgstr "Nome do tipo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:155 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:185 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:408 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:181 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:208 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:30 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:13 -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:26 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:407 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:33 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:26 msgid "All" msgstr "Todo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:333 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:421 msgid "Manual" msgstr "Manual" @@ -2176,32 +2298,27 @@ msgstr "Manual" msgid "Calendars List" msgstr "Lista de calendarios" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:183 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:209 msgid "Cannot be higher than Ending date" msgstr "Non pode ser posterior á data de fin" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:214 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:213 msgid "Create activation period" msgstr "Crear período de activación" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:10 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:30 msgid "Personal details" msgstr "Detalles persoais" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:206 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:21 msgid "Workers List" msgstr "Lista de traballadores" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:202 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:168 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:202 msgid "Criterion must be not-null" msgstr "O criterio non debe ser nulo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:292 -msgid "Worker" -msgstr "Traballador" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:399 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:487 msgid "" "Cannot allocate selected element. There is not any queue that matches " "resource allocation criteria at any interval of time" @@ -2209,8 +2326,12 @@ msgstr "" "Non se pode asignar o elemento seleccionado. Non hai ningunha cola que " "coincida cos criterios de asignación de recursos en ningún intervalo de tempo" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:254 +msgid "Worker" +msgstr "Traballador" + #: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:160 -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:206 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:214 msgid "criterion name not specified" msgstr "nome do criterio non especificado" @@ -2227,7 +2348,7 @@ msgstr "o " msgid "Advance Progress" msgstr "Progreso de avance" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:4 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:24 msgid "Manual allocation" msgstr "Asignación manual" @@ -2236,11 +2357,16 @@ msgid "External overload" msgstr "Sobrecarga externa" #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:32 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:69 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:57 msgid "Authorize" msgstr "Autorizar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:170 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:240 + +msgid "Scenarios" +msgstr "escenario" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:177 msgid "Create order from Template" msgstr "Crear pedido a partir de modelo" @@ -2252,20 +2378,20 @@ msgstr "Materiais gardados" msgid "Quarter" msgstr "Cuarto" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:699 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:738 msgid "Duplicate value true report global Advance for order element " msgstr "" "Valor duplicado verdadeiro para o atributo 'informar avance global' no " "elemento de pedido " -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:40 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:77 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:25 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:41 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:65 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:111 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:25 msgid "Profile name" msgstr "Nome do perfil" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:224 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:232 msgid "Could open generated PDF" msgstr "Non se puido abrir o PDF xerado" @@ -2273,10 +2399,16 @@ msgstr "Non se puido abrir o PDF xerado" msgid "Disable Delete" msgstr "Deshabilitar borrado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:145 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:143 msgid "You should select a source scenario" msgstr "Debe seleccionar un escenario de orixe" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:268 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 + +msgid "Estimated/Planned Hours Per Task" +msgstr "Horas estimadas completadas por tarefa" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:67 msgid "Assigned" msgstr "Asignado" @@ -2290,40 +2422,48 @@ msgid "" "The name is not valid, there is another advance type with the same name. " msgstr "O nome non é válido, xa hai outro tipo de avance co mesmo nome. " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:135 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:137 msgid "Company saved" msgstr "Empresa gardada" #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:234 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:173 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:174 msgid "Error: {0}" msgstr "Erro: {0}" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:162 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:161 msgid "Parent" msgstr "Pai" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:68 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:88 msgid "Earliest date" msgstr "Data máis cedo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:213 -msgid "Work report list" -msgstr "Lista de partes de traballo" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:114 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:116 msgid "Type of work hours saved" msgstr "Tipo de horas de traballo gardado" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:226 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:111 + +msgid "Projects" +msgstr "Perspectivas" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:148 + +msgid "Create Quality Form" +msgstr "Crear formulario de calidade" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java:63 msgid "Not found converter for {0}" msgstr "Non se atopou un conversor para {0}" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:69 msgid "Material assignments" msgstr "Asignacións de materiais" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:96 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:98 msgid "start in fixed date" msgstr "comezar en data fixa" @@ -2335,27 +2475,23 @@ msgstr "" "O valor non é válido, o valor de precisión debe ser menor que o valor máximo " "por defecto." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:916 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:919 msgid "Text field" msgstr "Campo de texto" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:194 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:193 msgid "Create new work week" msgstr "Crear nova semana de traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:137 -msgid "Create label type" -msgstr "Crear tipo de etiqueta" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:648 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:649 msgid "LIMITING RESOURCE" msgstr "RECURSO LIMITANTE" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:82 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:86 msgid "Extended view" msgstr "Vista expandida" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:168 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:189 msgid "" "The meausure name is not valid. There is another unit type with the same " "measure name" @@ -2367,16 +2503,12 @@ msgstr "" msgid "Work record" msgstr "Rexistro de traballo" -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:129 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:151 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:149 msgid "Output format" msgstr "Formato de saída" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:174 -msgid "Criterion saved" -msgstr "Criterio gardado" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:115 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:113 msgid "Error setting up edition form." msgstr "Erro preparando o formulario de edición." @@ -2388,27 +2520,22 @@ msgstr "Imprimir" msgid "NavalPlan: Calendars" msgstr "NavalPlan: Calendarios" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:59 +#: 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:380 -msgid "Hours cannot be null" -msgstr "As horas non poden ser nulas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:167 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:113 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:167 msgid "{0} not found type for criterion " msgstr "{0} non atopado tipo para criterio " -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:452 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:387 +msgid "Hours cannot be null" +msgstr "As horas non poden ser nulas" + +#: /home/dpino/workspace/navalplan/scripts/../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" -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21 -msgid "NavalPlan: Scheduling progress report" -msgstr "NavalPlan: Informe de avance de planificación" - #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:32 msgid "General user data" msgstr "Datos xerais do usuario" @@ -2418,38 +2545,38 @@ msgid "Unschedule" msgstr "Quitar planificación" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:51 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:216 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:38 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:42 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:175 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:48 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:65 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:97 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:41 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:110 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:84 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:77 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:148 #: navalplanner-webapp/src/main/webapp/common/layout/template.zul:89 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:130 -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:40 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:84 -#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:49 -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:78 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:87 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:101 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:156 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:181 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:112 -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:39 -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:43 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:130 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:84 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:77 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:132 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:65 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:97 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:42 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:46 #: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:33 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:132 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:38 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:42 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:217 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:175 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:40 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:139 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:84 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:39 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:43 +#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:78 +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:79 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:61 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:116 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:141 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:40 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:84 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:130 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:110 msgid "Cancel" msgstr "Cancelar" @@ -2467,26 +2594,27 @@ msgstr "Gráfico de horas acumuladas" msgid "Subcontracted task sent successfully" msgstr "A tarefa subcontratada enviouse con éxito" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:207 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:21 msgid "Machines List" msgstr "Lista de máquinas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:61 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:129 msgid "CPI" msgstr "CPI" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:8 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:9 -#: navalplanner-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:17 -msgid "Units" -msgstr "Unidades" - -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:52 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:53 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:47 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:45 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:52 msgid "Dates" msgstr "Datas" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:258 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:37 +msgid "Units" +msgstr "Unidades" + #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:39 msgid "Create Calendar" msgstr "Crear Calendario" @@ -2495,7 +2623,7 @@ msgstr "Crear Calendario" msgid "At least one stretch is needed" msgstr "Necesítase alo menos un tramo" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:311 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:302 msgid "a day is not valid" msgstr "un día non é válido" @@ -2507,37 +2635,35 @@ 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:414 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:477 +#: 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:450 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:515 msgid "There is no resource with this nif" msgstr "Non hai un recurso con este nif" -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:12 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:32 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27 msgid "name" msgstr "nome" -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:35 -msgid "Create new Work Report Type" -msgstr "Crear novo tipo de parte de traballo" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:168 -msgid "Cost category saved" -msgstr "Categoría de coste gardada" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:192 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:225 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:228 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:244 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:211 msgid "" "End date is not valid, the new end date must be greater than the start date" msgstr "" "Data de fin inválida, a data de fin nova debe ser posterior á data de inicio" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:169 +msgid "Cost category saved" +msgstr "Categoría de coste gardada" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java:118 msgid "{0} (max: {1})" msgstr "{0} (máx: {1})" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:542 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:602 msgid "end" msgstr "fin" @@ -2554,18 +2680,23 @@ msgstr "Autorizacións" msgid "Continue" msgstr "Continuar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:197 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:216 msgid "Start date cannot be null" msgstr "A data de inicio non pode ser nula" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java:49 -msgid "Generic" -msgstr "Xenérico" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:236 + +msgid "Subcontracting" +msgstr "Subcontratar" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1138 msgid "Value is not valid, the Precision value must be exact " msgstr "O valor non é válido, o valor de precisión debe ser exacto " +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java:49 +msgid "Generic" +msgstr "Xenérico" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java:127 msgid "Order does not exist" msgstr "O pedido non existe" @@ -2585,50 +2716,48 @@ msgstr "Engadir criterio requirido" msgid "Default max value" msgstr "Valor máximo por defecto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:372 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionBandboxFinder.java:46 + +msgid "Criterion Name" +msgstr "Nome do criterio" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:460 msgid "Automatic" msgstr "Automático" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:126 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:134 msgid "Task" msgstr "Tarefa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:233 -msgid "Manage external companies" -msgstr "Administrar empresas externas" - +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:127 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:123 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:149 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:269 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:197 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:84 msgid "please, select a label" msgstr "por favor, seleccione unha etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:391 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:396 msgid "Calculate End Date" msgstr "Calcular data de fin" -#: navalplanner-webapp/src/main/webapp/labels/labelTypes.zul:20 -msgid "NavalPlan: Label types" -msgstr "NavalPlan: Tipos de etiqueta" - -#: navalplanner-webapp/src/main/webapp/users/users.zul:22 -msgid "NavalPlan: User accounts" -msgstr "NavalPlan: Contas de usuario" - #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:106 msgid "Add profile" msgstr "Engadir perfil" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:214 msgid "filter already exists" msgstr "o filtro xa existe" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:233 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:223 msgid "missing code in a calendar data version" msgstr "falta código nos datos de versión dun calendario" -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:17 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:21 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:37 #: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:26 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:45 msgid "Criterion name" msgstr "Nome do criterio" @@ -2640,7 +2769,7 @@ msgstr "os valores non son válidos, non deben ser nulos" msgid "Task name" msgstr "Nome da tarefa" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:127 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:127 msgid "cost assignment's resource not specified" msgstr "recurso da asignación de coste non especificado" @@ -2656,14 +2785,14 @@ msgstr "Engadir novo criterio requirido" msgid "Select the date from which the new version will be valid" msgstr "Seleccione a data a partir da cal a versión nova será válida" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:123 +msgid "Budgeted Cost Work Performed" +msgstr "Coste presupostado do traballo realizado" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1311 msgid "This advance measurement can not be in " msgstr "Esta medida de avance non pode estar en " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:55 -msgid "Budgeted Cost Work Performed" -msgstr "Coste presupostado do traballo realizado" - #: navalplanner-webapp/src/main/webapp/common/configuration.zul:79 msgid "Work report" msgstr "Parte de traballo" @@ -2672,23 +2801,28 @@ msgstr "Parte de traballo" msgid "the name must be not empty" msgstr "o nome non pode ser baleiro" -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:90 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:86 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:58 #: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:26 msgid "Disabled" msgstr "Deshabilitado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:287 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:333 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:462 msgid "Earned value" msgstr "Valor gañado" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:82 + +msgid "Edit Work Hours Type" +msgstr "Editar traballador" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:42 msgid "From Today" msgstr "A partir de hoxe" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:671 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:684 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:677 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:690 msgid "{0} not supported yet" msgstr "{0} aínda non soportado" @@ -2696,7 +2830,9 @@ msgstr "{0} aínda non soportado" msgid "New entry" msgstr "Entrada nova" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:48 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:104 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:113 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:213 msgid "Resources Load" msgstr "Carga de recursos" @@ -2704,10 +2840,6 @@ msgstr "Carga de recursos" msgid "Overload due to current order" msgstr "Sobrecarga debido ao pedido actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:46 -msgid "Overall Resources Load" -msgstr "Carga global de recursos" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:118 msgid "Changes have been canceled" msgstr "Cambios cancelados" @@ -2717,11 +2849,12 @@ msgstr "Cambios cancelados" msgid "Machine saved" msgstr "Máquina gardada" -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:21 -msgid "Advance type list" -msgstr "Lista de tipos de avance" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:126 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:81 +msgid "Create Cost Category" +msgstr "Editar categoría de coste" + +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:101 msgid "Appropriative allocation" msgstr "Asignación apropiativa" @@ -2729,9 +2862,9 @@ msgstr "Asignación apropiativa" msgid "Assigned criterion requirements" msgstr "Criterios requiridos asignados" -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:16 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:12 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:14 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:36 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:34 msgid "Apply filtering to order elements satisfying required criteria" msgstr "" "Aplicar filtrado aos elementos de pedido que satisfán os criterios requeridos" @@ -2745,7 +2878,7 @@ msgstr "Os avances calculados non se poden modificar" msgid "Max value" msgstr "Valor máximo" -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:51 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:58 msgid "No" msgstr "Non" @@ -2758,7 +2891,7 @@ msgstr "Lista de escenarios" msgid "The name is not valid, the name must not be null " msgstr "O nome non é válido, non debe ser nulo " -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:129 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 msgid "Hours to allocate" msgstr "Horas a asignar" @@ -2771,21 +2904,17 @@ msgstr "Debe seleccionar unha categoría" msgid "Spread" msgstr "Propagación" -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21 -msgid "NavalPlan: Working progress report" -msgstr "NavalPlan: Informe de progreso de traballo" - -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:70 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:90 msgid "Select start date" msgstr "Seleccionar data de inicio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:156 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:154 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:750 #: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:187 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:724 msgid "Removed {0}" msgstr "{0} borrado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:728 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:736 msgid "Confirm deleting this worker. Are you sure?" msgstr "Confirmar o borrado deste traballador. ¿Está seguro?" @@ -2793,7 +2922,7 @@ msgstr "Confirmar o borrado deste traballador. ¿Está seguro?" msgid "Group name" msgstr "Nome do grupo" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:63 msgid "Start date:" msgstr "Data de inicio:" @@ -2802,24 +2931,29 @@ msgstr "Data de inicio:" msgid "Role name" msgstr "Nome do rol" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:747 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:755 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/company/CompanyPlanningModel.java:411 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:623 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:459 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:610 msgid "h" msgstr "h" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:588 + +msgid "Create Work Report" +msgstr "Crear traballador" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:114 msgid "Value is not valid, the precision value must not be empty" msgstr "O valor non é válido, o valor de precisión non debe estar baleiro" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:344 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:353 msgid "Workable capacity for this period " msgstr "Capacidade de traballo para este período " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:188 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:190 msgid "Cannot delete profile: it does not exist anymore" msgstr "Non se pode borrar o perfil: xa non existe" @@ -2827,38 +2961,44 @@ msgstr "Non se pode borrar o perfil: xa non existe" msgid "Unit Types" msgstr "Tipos de unidade" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1263 -msgid "Add new advance measurement" -msgstr "Engadir nova medida de avance" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:219 + +msgid "Edit Machine" +msgstr "Editar máquina" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java:99 msgid "Add Milestone" msgstr "Engadir fito" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:109 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:117 msgid "Assign selected items" msgstr "Asignar elementos seleccionados" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:520 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:580 msgid "init" msgstr "inicio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:415 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:503 msgid "Select for automatic queuing" msgstr "Seleccione para encolar automáticamente" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:241 + +msgid "Scenarios Management" +msgstr "Administración de horas" + #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:95 msgid "Create & Assign" msgstr "Crear e asignar" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:131 +msgid "Edit User" +msgstr "Editar usuario" + #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:31 msgid "Print layout" msgstr "Saída de impresión" -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:23 -msgid "Edit User" -msgstr "Editar usuario" - #: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:54 msgid "Maximum/minimum of the estimated hours" msgstr "Máximo/mínimo das horas estimadas" @@ -2872,51 +3012,32 @@ msgid "" "The date is not valid, the date must be unique for this advanced assignment" msgstr "A data non é válida, debe ser única para esta asignación de avance" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:107 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:110 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:135 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:95 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:119 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:122 msgid "Consolidated" msgstr "Consolidado" -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:21 -msgid "Profiles listing" -msgstr "Listado de perfís" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:211 -msgid "Work report types" -msgstr "Tipos de partes de traballo" - #: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:216 msgid "missing code in a material" msgstr "falta o código nun material" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:239 -msgid "Completed estimated hours" -msgstr "Horas estimadas completadas" - -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:101 msgid "Customer" msgstr "Cliente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:756 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:772 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:74 msgid "Hours type" msgstr "Tipo de horas" #: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:155 -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:191 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:204 msgid "criterion type name not specified" msgstr "nome do tipo de criterio non especificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:232 -msgid "Manage user accounts" -msgstr "Administrar contas de usuario" - -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:23 -msgid "Edit profile" -msgstr "Editar perfil" - #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:219 msgid "Add Exception" msgstr "Engadir excepción" @@ -2927,18 +3048,14 @@ msgstr "Engadir excepción" msgid "cannot be empty" msgstr "non pode ser baleiro" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 -msgid "Completed estimated hours per task" -msgstr "Horas estimadas completadas por tarefa" - -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:47 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:48 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:47 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:6 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:6 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:26 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:26 msgid "from" msgstr "desde" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:145 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:146 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:105 msgid "Heading Fields" msgstr "Campos de cabeceira" @@ -2951,7 +3068,7 @@ msgstr "" "O período de tempo contén datos inválidos. A data de fin debe ser maior cá " "de inicio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:209 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:210 msgid "A type must be selected" msgstr "Debe seleccionar un tipo" @@ -2960,24 +3077,98 @@ msgstr "Debe seleccionar un tipo" msgid "Day is not valid" msgstr "O día non é válido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:474 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:907 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:489 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:911 msgid "You should select a start date for the exception" msgstr "Debe seleccionar unha data de inicio para a excepción" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:60 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:128 msgid "Variance At Completion" msgstr "Desviación ó coste final" -#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:64 +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:70 #: navalplanner-webapp/src/main/webapp/common/layout/login.zul:48 msgid "Help" msgstr "Axuda" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:43 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:63 msgid "Exportation options" msgstr "Opcións de exportación" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:52 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:53 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:52 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ScenarioBandboxFinder.java:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplateFinder.java:51 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:87 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:354 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:499 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:952 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:39 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:51 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:24 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:54 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:106 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:32 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:26 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:37 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:160 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:26 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:78 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:47 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:111 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:152 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:97 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:126 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:166 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:100 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:141 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:98 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:138 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:179 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:98 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:33 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:49 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:40 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:125 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:149 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:26 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:58 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:108 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:68 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:39 +#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:26 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:30 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:49 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:53 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:75 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:27 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:48 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:109 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:40 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:76 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:26 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:25 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:40 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:72 +msgid "Name" +msgstr "Nome" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:159 msgid "" "Could not save time period. Time period overlaps with another non-compatible " @@ -2986,91 +3177,34 @@ msgstr "" "Non se puido gardar o período de tiempo. O período solápase con outro " "período de tempo incompatible" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:87 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ScenarioBandboxFinder.java:47 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java:47 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:53 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplateFinder.java:51 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:52 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:52 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:952 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:354 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:26 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:33 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:49 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:40 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:121 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:145 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:36 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:26 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:23 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:38 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:24 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:24 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:32 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:30 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:51 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:106 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:54 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:34 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:25 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:62 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:26 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:40 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:72 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:25 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:39 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:51 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:73 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:88 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:78 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:54 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:73 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:26 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:76 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:27 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:97 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:48 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:68 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:27 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:108 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:30 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:49 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:53 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:75 -#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:26 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:40 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:76 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:37 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:161 -#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:26 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:39 -msgid "Name" -msgstr "Nome" - -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:42 #: navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:42 msgid ">>" msgstr ">>" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:61 + +msgid "Seconds" +msgstr "Enviar" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:107 msgid "please, select an item" msgstr "por favor, seleccione un elemento" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:151 -msgid "Day of week" -msgstr "Día da semana" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:360 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:367 msgid "Time Start cannot be null" msgstr "A hora de inicio non pode ser nula" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:623 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:21 + +msgid "Companies List" +msgstr "Lista de máquinas" + +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:150 +msgid "Day of week" +msgstr "Día da semana" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:666 msgid "It not could remove the order element " msgstr "Non se puido borrar o elemento de pedido " @@ -3078,29 +3212,27 @@ msgstr "Non se puido borrar o elemento de pedido " msgid "Stretches with Interpolation" msgstr "Tramos con interpolación" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java:143 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:265 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:49 + +msgid "Hours Worked Per Resource" +msgstr "Horas traballadas por traballador" + +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java:143 msgid "The end date cannot be before the init date" msgstr "A data de fin non pode ser anterior á data de inicio" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationCommand.java:66 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:108 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:68 msgid "Advance consolidation" msgstr "Consolidación de avances" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:143 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:143 msgid "cost assignment with end date less than start date" msgstr "a asignación de coste ten data de fin anterior á de inicio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1286 -msgid "" -"This advance can not be removed, because it is spread. It is necessary to " -"select another advance as spread." -msgstr "" -"Este avance non se pode eliminar porque é propagado. Cómpre seleccionar " -"outro avance como propagado" - -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:14 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:34 msgid "Category name" msgstr "Nome da categoría" @@ -3108,29 +3240,34 @@ msgstr "Nome da categoría" msgid "Maximum/minimum of the worked hours" msgstr "Máximo/mínimo das horas traballadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:648 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:685 msgid "Not the same material, impossible to update" msgstr "Non é o mesmo material, imposible actualizar" +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21 + +msgid "NavalPlan: Work And Progress Per Task" +msgstr "NavalPlan: Informe de progreso de traballo" + #: navalplanner-webapp/src/main/webapp/common/layout/template.zul:55 msgid "Main menu" msgstr "Menú principal" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:135 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:612 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:638 msgid "cannot include an Advance of the same Advance type twice" msgstr "non se pode asignar un avance do mesmo tipo dúas veces" -#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:37 #: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:42 +#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:37 msgid "Create From Template" msgstr "Crear a partir de modelo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:368 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:367 msgid "There exists other workReportType with the same name." msgstr "Xa existe outro tipo de parte de traballo co mesmo nome." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:149 #: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:28 msgid "Schedule" msgstr "Planificar" @@ -3139,7 +3276,12 @@ msgstr "Planificar" msgid "Unexpected: {0}" msgstr "Inesperado: {0}" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:89 + +msgid " {0}s" +msgstr "{0}" + +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:127 msgid "worker's NIF not specified" msgstr "NIF do traballador non especificado" @@ -3155,11 +3297,21 @@ msgstr "" msgid "Notes" msgstr "Notas" +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:22 + +msgid "NavalPlan: Transfer Projects Between Scenarios" +msgstr "Transferir pedidos entre escenarios" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:223 msgid "Connect" msgstr "Conectar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:212 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:20 + +msgid "NavalPlan: Units" +msgstr "NavalPlan: Tipos de unidades" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:216 msgid "Allocation: [{0},{1}]" msgstr "Asignación: [{0},{1}]" @@ -3171,10 +3323,14 @@ msgstr "Código do elemento de pedido" msgid "Changes saved" msgstr "Cambios gardados" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1042 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1072 msgid "See scheduling" msgstr "Ver planificación" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1262 +msgid "Add measure" +msgstr "Engadir medida" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:142 msgid "" "Some order was created during the configuration process, it is impossible to " @@ -3184,49 +3340,56 @@ msgstr "" "actualizar a táboa de secuencia de pedido. Por favor, volva intentalo máis " "tarde" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:234 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:238 msgid "Work report saved" msgstr "Parte de traballo gardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:607 -msgid "Other orders" -msgstr "Outros pedidos" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:408 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java:52 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:75 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:421 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java:51 +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:66 msgid "Subcontract" msgstr "Subcontratar" -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29 -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26 -msgid "Relationship" -msgstr "Relación" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:632 +msgid "Other orders" +msgstr "Outros pedidos" +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:118 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:36 #: navalplanner-webapp/src/main/webapp/planner/main.zul:56 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:98 msgid "End" msgstr "Fin" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:546 -msgid "There are not any assigned advance to current task" -msgstr "Non hai ningún avance asignado á tarea actual" +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29 +msgid "Relationship" +msgstr "Relación" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1177 msgid "The date is not valid, the date must be not empty" msgstr "A data non é válida, non debe ser baleira" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:546 +msgid "There are not any assigned advance to current task" +msgstr "Non hai ningún avance asignado á tarea actual" + #: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:25 msgid "User login name" msgstr "Nome de usuario" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:427 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:488 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:253 + +msgid "Cost Categories" +msgstr "Categorías" + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:95 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:167 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:463 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:526 msgid "There is no order element with this code" msgstr "Non hai ningún elemento de pedido con este código" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:215 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:227 msgid "criterion type not specified" msgstr "tipo de criterio non especificado" @@ -3238,24 +3401,39 @@ msgstr "" "Outro usuario modificou os mesmos datos, polo tanto a operación non se pode " "completar con seguridade." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:142 -msgid "must be not empty" -msgstr "non pode ser baleiro" - #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:69 msgid "Show all resource assignments" msgstr "Mostrar todas as asignacións de recursos" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:26 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:54 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:142 +msgid "must be not empty" +msgstr "non pode ser baleiro" + +#: navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:22 + +msgid "NavalPlan: Companies" +msgstr "NavalPlan: Plantillas" + +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:21 + +msgid "Users List" +msgstr "Listado de usuarios" + #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:51 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:54 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:26 msgid "Task quality forms" msgstr "Formularios de calidade de tarefa" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:447 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:462 msgid "Not working day" msgstr "Día non laborable" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:28 + +msgid "Cost category" +msgstr "Categoría de coste gardada" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java:73 msgid "Resource allocation" msgstr "Asignación de recursos" @@ -3264,7 +3442,7 @@ msgstr "Asignación de recursos" msgid "please, select a quality form" msgstr "por favor, seleccione un formulario de calidade" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:387 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:386 msgid "Exist other workReportType with the same code." msgstr "Xa existe outro tipo de parte de traballo co mesmo código." @@ -3276,32 +3454,32 @@ msgstr "Restrición" msgid "Customer reference code" msgstr "Código de referencia do cliente" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:139 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:143 msgid "Add New Label Type Field" msgstr "Engadir novo campo de tipo de etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:370 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:377 msgid "Time finish cannot be null" msgstr "A hora de fin non pode ser nula" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:108 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:108 msgid "Customer reference" msgstr "Referencia del cliente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:487 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:497 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:318 #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:145 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:733 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:416 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:549 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:607 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:731 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:764 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:773 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:796 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:443 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:148 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:297 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:529 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:581 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:705 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:738 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:747 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:782 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:733 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:486 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:496 msgid "Information" msgstr "Información" @@ -3309,7 +3487,7 @@ msgstr "Información" msgid "END" msgstr "FIN" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:193 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:194 msgid "Worker saved" msgstr "Traballador gardado" @@ -3317,23 +3495,29 @@ msgstr "Traballador gardado" msgid "can not pass until the previous item is passed." msgstr "non se pode pasar mentres o elemento anterior non sexa pasado." -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:36 -msgid "Create new advance type" -msgstr "Crear un novo tipo de avance" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementModel.java:205 msgid "New hours group " msgstr "novo grupo de horas " -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:79 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:100 +#: navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:21 + +msgid "NavalPlan: Quality Forms" +msgstr "NavalPlan: Formularios de calidade" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:422 +msgid "Assign element to queue manually" +msgstr "Asignar elemento á cola manualmente" + #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:100 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:79 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 msgid "Filter by orders" msgstr "Filtrar por pedidos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:207 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:211 msgid "Resource: {0} " msgstr "Recurso: {0} " @@ -3341,6 +3525,16 @@ msgstr "Recurso: {0} " msgid "percentage cannot be duplicated" msgstr "a porcentaxe non pode estar duplicada" +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:53 + +msgid "Edit Template" +msgstr "Editar modelo" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:259 + +msgid "Work Hours" +msgstr "Partes de traballo" + #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:26 msgid "Heading" msgstr "Cabeceira" @@ -3357,7 +3551,7 @@ msgstr "Non se puido gardar a máquina" msgid "Unable to convert value to {0} type" msgstr "No se puido convertir o valor a tipo {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:341 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:334 msgid "The calendar exception type not found" msgstr "Tipo de excepción de calendario non atopado" @@ -3365,12 +3559,12 @@ 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:1014 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1015 msgid "Some criterion satisfactions overlap in time" msgstr "Algúns criterios satisfeitos solápanse no tempo" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:593 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:529 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:551 msgid "New order version" msgstr "Nova versión de pedido" @@ -3378,36 +3572,35 @@ msgstr "Nova versión de pedido" msgid "Worker assignments" msgstr "Asignacións de traballador" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:133 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:487 #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:149 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:115 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:142 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:308 #: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:220 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:389 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:411 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:476 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:980 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:115 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:142 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:308 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:979 #, java-format msgid "{0} already exists" msgstr "{0} xa existe" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:272 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:273 msgid "Create Worker" msgstr "Crear traballador" -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:17 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:37 msgid "Code " msgstr "Código" -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:52 -msgid "Password confirmation" -msgstr "Confirmación de contrasinal" - #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:41 msgid "Paper size" msgstr "Tamaño de papel" +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:52 +msgid "Password confirmation" +msgstr "Confirmación de contrasinal" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1266 msgid "None" msgstr "Ningún" @@ -3420,18 +3613,18 @@ msgstr "Parte de traballo" msgid "Work" msgstr "Traballo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:119 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:406 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:494 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:402 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:119 #: navalplanner-webapp/src/main/webapp/common/event_error.zul:21 msgid "Error" msgstr "Erro" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:62 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130 msgid "Cost Performance Index" msgstr "Eficiencia en coste" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:160 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:179 msgid "" "Criterion is not valid, the criterion overlap other criterionSatisfaction " "whith same criterion" @@ -3439,7 +3632,7 @@ msgstr "" "Criterion non é válido, outro criterionSatisfaction solápase co mesmo " "criterion" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:60 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:128 msgid "ETC" msgstr "ETC" @@ -3447,10 +3640,6 @@ msgstr "ETC" msgid "Log out" msgstr "Saír" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:53 -msgid "Edit template" -msgstr "Editar modelo" - #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:23 msgid "Add new configuration unit" msgstr "engadir nova unidade de configuración" @@ -3459,7 +3648,7 @@ msgstr "engadir nova unidade de configuración" msgid "Main preferences" msgstr "Preferencias principais" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:160 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:179 msgid "" "Criterion is not valid, it overlaps other criterionSatisfaction with the " "same criterion" @@ -3471,8 +3660,8 @@ msgstr "" msgid "Label type saved" msgstr "Tipo de etiqueta gardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:384 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:527 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:419 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:568 msgid "missing field name in a description value" msgstr "falta o nome de campo nun valor de descrición" @@ -3480,7 +3669,7 @@ msgstr "falta o nome de campo nun valor de descrición" msgid "Add new worker assignment" msgstr "Engadir nova asignación de traballador" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:409 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:408 msgid "Show all elements" msgstr "Mostrar tódolos elementos" @@ -3488,17 +3677,18 @@ msgstr "Mostrar tódolos elementos" msgid "Limited resource" msgstr "Recursos limitantes" -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:86 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:80 msgid "Show dependencies:" msgstr "Mostrar dependencias:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:132 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:133 msgid "Hours Group at " msgstr "Grupo de horas en " -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:21 -msgid "Work Report types" -msgstr "Tipos de partes de traballo" +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:65 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:59 +msgid "Total Estimated hours" +msgstr "Horas totais estimadas" #: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:26 msgid "Your session has expired after inactivity period. Please log in again." @@ -3506,17 +3696,17 @@ msgstr "" "A súa sesión expirou tras un tiempo de inactividade. Por favor, inicie " "sesión de novo." -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:55 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:62 -msgid "Total Estimated hours" -msgstr "Horas totais estimadas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:139 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:164 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:165 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:190 msgid "SPREAD" msgstr "PROPAGACIÓN" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:53 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:304 + +msgid "a day is empty" +msgstr "un día non é válido" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:121 msgid "Budgeted Cost Work Scheduled" msgstr "Coste de traballo presupostado planificado" @@ -3524,7 +3714,7 @@ msgstr "Coste de traballo presupostado planificado" msgid "Name cannot be null or empty" msgstr "O nome non pode ser nulo ou baleiro" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:11 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:31 msgid "Queue Element Information" msgstr "Información de elemento de cola" @@ -3536,19 +3726,24 @@ msgstr "Data de inicio" msgid "Create Order" msgstr "Crear pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:56 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:21 + +msgid "Virtual Workers Groups List" +msgstr "Grupos virtuais de traballadores" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 msgid "Cost Variance" msgstr "Desviación en coste" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:437 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:454 msgid "criterion type does not allow resource hierarchy" msgstr "o tipo de criterio non permite xerarquía de recursos" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:106 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:109 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:142 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:53 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:79 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:142 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:118 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:121 msgid "Total" msgstr "Total" @@ -3556,7 +3751,7 @@ msgstr "Total" msgid "A1" msgstr "A1" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:198 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:217 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:98 msgid "Invalidate" msgstr "Invalidar" @@ -3565,11 +3760,11 @@ msgstr "Invalidar" msgid "Budget hours" msgstr "Horas do presuposto" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:149 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:155 msgid "Edit task: {0}" msgstr "Editar tarefa: {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1569 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1582 msgid "OrderElement not found" msgstr "Elemento de pedido non atopado" @@ -3581,8 +3776,8 @@ msgstr "" "Outro elemento de pedido na mesma rama xa está informando dun avance para " "este formulario de calidade" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:506 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:259 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:506 msgid "must be greater than the previous date." msgstr "debe ser maior cá data anterior." @@ -3590,42 +3785,37 @@ msgstr "debe ser maior cá data anterior." msgid "NavalPlan: Advanced allocation" msgstr "NavalPlan: Asignación avanzada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java:514 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1399 -msgid "Show all" -msgstr "Mostrar todo" - #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:44 msgid "A4" msgstr "A4" -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:27 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1412 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java:533 +msgid "Show all" +msgstr "Mostrar todo" + #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:57 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:27 msgid "Default price" msgstr "Prezo por defecto" -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:37 msgid "Estimated hours" msgstr "Horas estimadas" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:132 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:144 msgid "Apply tab changes" msgstr "Aplicar cambios da pestana" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:234 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:236 msgid "passwords don't match" msgstr "os contrasinais non coinciden" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:51 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:71 msgid "Hours groups" msgstr "Grupos de horas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:202 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:33 -msgid "Subcontracted tasks list" -msgstr "Lista de tarefas subcontratadas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:237 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:249 #: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:33 msgid "Create new order" msgstr "Crear pedido novo" @@ -3634,22 +3824,37 @@ msgstr "Crear pedido novo" msgid "Transfer" msgstr "Transferir" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:126 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:21 + +msgid "Work Hours Types List" +msgstr "Lista de traballadores" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:145 msgid "Unit {0} cannot be removed because it is used in materials" msgstr "A unidade {0} non pode borrarse porque está a ser usada en materiais" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:116 + +msgid "Create User" +msgstr "Crear pedido" + #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:65 msgid "Reference date" msgstr "Data de referencia" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:56 -msgid "CV" -msgstr "CV" +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:105 +msgid "NavalPlan: Task Scheduling Status In Project" +msgstr "NavalPlan: Informe de estado de planificación" + +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:117 msgid "Original" msgstr "Orixinal" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 +msgid "CV" +msgstr "CV" + #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:30 msgid "Stretches function configuration" msgstr "Configuración da función de tramos" @@ -3664,7 +3869,7 @@ msgid "Not indentable" msgstr "Non indentable" #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:482 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:74 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:70 msgid "List of materials for all categories (select one to filter)" msgstr "" "Lista de materiais paa tódalas categorías (seleccione unha para filtrar)" @@ -3673,11 +3878,7 @@ msgstr "" msgid "User disabled" msgstr "Usuario deshabilitado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:234 -msgid "Manage scenarios" -msgstr "Xestionar escenarios" - -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:11 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:31 msgid "Order element name" msgstr "Nome do elemento de pedido" @@ -3685,64 +3886,60 @@ msgstr "Nome do elemento de pedido" msgid "Association with profiles" msgstr "Asociación con perfís" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:514 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:517 msgid "end date: {0} must be after start date: {1}" msgstr "data de fin: {0} debe ser posterior á data de inicio {1}" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:115 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:114 msgid "worker's surname not specified" msgstr "apelidos do traballador non especificados" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:207 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:208 msgid "Error on removing workReportType: " msgstr "Erro ao borrar tipo de parte de traballo: " -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:47 #: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:47 msgid "Save changes" msgstr "Gardar cambios" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:114 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:199 msgid "Total dedication" msgstr "Dedicación total" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:735 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:743 msgid "Worker deleted" msgstr "Traballador borrado" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:17 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:42 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:37 msgid "Subcontratation date" msgstr "Data de subcontratación" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:23 -msgid "Edit external company" -msgstr "Editar empresas externas" - +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:120 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:58 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:121 msgid "Day" msgstr "Día" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:203 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:33 -msgid "Report advances" -msgstr "Notificar avances" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:153 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:864 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1113 +msgid "Edit Label Type" +msgstr "Editar tipo de etiqueta" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:878 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1126 msgid "Please, select an item" msgstr "Por favor, seleccione un elemento" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:170 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:168 msgid "Order version is the same in source and destination scenarios" msgstr "A versión do pedido é a mesma nos escenarios de orixe e destino" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:176 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:177 msgid "Work report type saved" msgstr "Tipo de partes de traballo gardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1063 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1077 msgid "Cannot be higher than finish hour" msgstr "Non pode ser posterior á data de fin" @@ -3754,18 +3951,18 @@ msgstr "Prefixo" msgid "New Template element" msgstr "Novo elemento de modelo" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:35 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:55 msgid "Subcontracted code" msgstr "Código subcontratado" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:259 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:327 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:249 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:320 msgid "The base calendar parent not found" msgstr "Calendario base pai non atopado" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:108 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:111 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:120 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:123 msgid "Non Consolidated" msgstr "Non consolidado" @@ -3774,33 +3971,48 @@ msgid "Reassigning type" msgstr "Tipo de reasignación" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:48 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:119 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:125 -#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java:71 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java:46 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:120 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:133 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java:72 msgid "Order" msgstr "Pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:856 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:252 + +msgid "Edit Virtual Workers Group" +msgstr "Editar grupos virtuais de traballadores" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:403 + +msgid "Edit limiting resource element" +msgstr "Borrar elemento de recurso limitante" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:859 msgid "The field name must be unique, not null and not empty" msgstr "O nome do campo debe ser único, non nulo e non baleiro" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:360 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:123 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:146 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:127 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:77 msgid "Position" msgstr "Posición" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:107 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:96 -msgid "Edit work report" -msgstr "Editar parte de traballo" +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:52 + +msgid "Edit task" +msgstr "Editar tarefa: {0}" #: navalplanner-webapp/src/main/webapp/common/layout/login.zul:98 msgid "Incorrect authentication" msgstr "Identificación incorrecta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:99 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:96 +msgid "Edit work report" +msgstr "Editar parte de traballo" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:184 msgid "All order tasks" msgstr "Todas as tarefas do pedido" @@ -3808,7 +4020,7 @@ msgstr "Todas as tarefas do pedido" msgid "Value last advance measurement" msgstr "Valor última medida de avance" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:758 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:761 msgid "A description field of the same name already exists." msgstr "Xa existe un campo de descrición co mesmo nome." @@ -3816,13 +4028,18 @@ msgstr "Xa existe un campo de descrición co mesmo nome." msgid "Current value" msgstr "Valor actual" -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:45 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:163 + +msgid "Edit Quality Form" +msgstr "Editar formulario de calidade" + #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:51 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:45 msgid "Zoom level" msgstr "Nivel de zoom" #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:27 -#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:159 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:159 msgid "Quality form" msgstr "Formulario de calidade" @@ -3830,22 +4047,26 @@ msgstr "Formulario de calidade" msgid "Profile data" msgstr "Datos do perfil" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:229 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 msgid "Configuration" msgstr "Configuración" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeModel.java:76 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeModel.java:95 msgid "It was not possible load entity. Not found. Id: " msgstr "Non foi posible cargar a entidade. Non atopada. Id: " +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:503 + +msgid "Create Virtual Workers Group" +msgstr "Crear traballador virtual" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:70 msgid "Total order element hours" msgstr "Total de horas en elementos de pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:506 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:835 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:878 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:512 msgid "Hours invested" msgstr "Horas invertidas" @@ -3857,32 +4078,37 @@ msgstr "Porcentaxe de cantidade de traballo" msgid "Date last advance reported" msgstr "Data último avance notificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:647 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:648 msgid "ALL" msgstr "TODOS" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:220 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:220 msgid "criterion satisfaction's resource not specified" msgstr "recurso do criterio satisfeito non especificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:443 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:458 msgid "Derived exception" msgstr "Excepción derivada" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:31 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:36 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:40 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:35 msgid "Resources search" msgstr "Busca de recursos" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:232 + +msgid "Machines" +msgstr "Máquina" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:144 msgid "Couldn't find element: {0}" msgstr "Non se puido atopar o elemento: {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:177 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:179 msgid "Confirm deleting this profile. Are you sure?" msgstr "Confirmar o borrado deste perfil. ¿Está seguro?" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:149 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:147 msgid "You should select a destination scenario" msgstr "Debe seleccionar un escenario de destino" @@ -3891,11 +4117,6 @@ msgstr "Debe seleccionar un escenario de destino" msgid "unit type code not found" msgstr "código de tipo de unidade non atopado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:200 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:44 -msgid "Limiting resources" -msgstr "Recursos limitantes" - #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:41 msgid "Resource :" msgstr "Recurso :" @@ -3908,32 +4129,31 @@ msgstr "Escenario de destino" msgid "Order element" msgstr "Elemento de pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:197 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:106 -msgid "Company view" -msgstr "Vista da compañía" - #: navalplanner-webapp/src/main/webapp/common/configuration.zul:21 msgid "NavalPlan: Configuration" msgstr "NavalPlan: Configuración" +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:106 +msgid "Company view" +msgstr "Vista da compañía" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:129 msgid "Just one order sequence must be active" msgstr "Só pode estar activo unha secuencia de pedido" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:4 -msgid "Filter by" -msgstr "Filtrar por" - -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:14 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:75 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:36 #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:75 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:34 msgid "Limiting resource" msgstr "Recurso limitante" +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:24 +msgid "Filter by" +msgstr "Filtrar por" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java:57 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:166 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:126 msgid "Calendar allocation" msgstr "Asignación de calendario" @@ -3941,22 +4161,27 @@ msgstr "Asignación de calendario" msgid "Choose a order element from which create a template from" msgstr "Seleccione un elemento de pedido a partir do que crear unha plantilla" -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:89 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:12 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:13 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:111 -msgid "Category" -msgstr "Categoría" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:37 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:43 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:46 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:41 msgid "Order Element Information" msgstr "Información de elemento de pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:154 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:85 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:111 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:33 +msgid "Category" +msgstr "Categoría" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:184 msgid "must be greater than finish date" msgstr "debe ser maior que a data de fin" +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 + +msgid "NavalPlan: Materials Needs At Date" +msgstr "NavalPlan: Materiais" + #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:26 msgid "Category data" msgstr "Datos de categoría" @@ -3965,7 +4190,7 @@ msgstr "Datos de categoría" msgid "Search" msgstr "Buscar" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:115 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:119 msgid "Add New Complementary Field" msgstr "Engadir novo campo complementario" @@ -3973,37 +4198,37 @@ msgstr "Engadir novo campo complementario" msgid "Source scenario" msgstr "Escenario de origen" +#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:49 +msgid "Remove calendar" +msgstr "Borrar calendario" + #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:124 msgid "%" msgstr "%" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:49 -#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:42 -msgid "Remove calendar" -msgstr "Borrar calendario" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1466 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1630 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:583 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:495 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:139 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:207 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:584 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:169 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1479 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1643 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:893 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1137 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:183 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:300 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:833 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1107 msgid "must be lower than finish date" msgstr "debe ser anterior á data de fin" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:82 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:84 msgid "Order Element" msgstr "Elemento de pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:711 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:288 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:159 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:719 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:72 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:160 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:69 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:119 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:71 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33 msgid "Resource" msgstr "Recurso" @@ -4012,6 +4237,12 @@ msgstr "Recurso" msgid "Could not load any resource" msgstr "Non se puido cargar un recurso" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:266 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 + +msgid "Work And Progress Per Project" +msgstr "Progreso de traballo por tarefa" + #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:34 msgid "Material search" msgstr "Búsqueda de materiais" @@ -4024,27 +4255,27 @@ msgstr "" "Debe permitir múltiples criterios activos para este tipo para usar esta " "estratexia de asignación" -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:10 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:30 msgid "sub elements" msgstr "sub elementos" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:147 -msgid "Default Label" -msgstr "Etiqueta por defecto" - -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:176 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:88 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:124 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:93 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:88 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:180 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:104 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:136 msgid "Close" msgstr "Pechar" +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:151 +msgid "Default Label" +msgstr "Etiqueta por defecto" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateController.java:108 #: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:270 msgid "error doing reassignation: {0}" msgstr "Erro realizando reasignación: {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:319 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:318 msgid "Time filter" msgstr "Filtrado de tempo" @@ -4056,54 +4287,74 @@ msgstr "Crear copia" msgid "Company data" msgstr "Datos da empresa" +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:33 + +msgid "Work Report Lines List" +msgstr "Listado de liñas de parte de traballo" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:206 +msgid "Unit type code cannot be empty" +msgstr "O código de tipo de unidade non pode ser baleiro" + #: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:21 msgid "Criterions Requirement" msgstr "Criterios requiridos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:185 -msgid "Unit type code cannot be empty" -msgstr "O código de tipo de unidade non pode ser baleiro" - #: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:46 msgid "Average of the estimated hours" msgstr "Media de horas estimadas" +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:49 +msgid "Length percentage" +msgstr "Porcentaxe de lonxitude" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:158 + +msgid "Create Unit Type" +msgstr "Tipos de unidade" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:176 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:243 msgid "Quality form saved" msgstr "Formulario de calidade gardado" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:49 -msgid "Length percentage" -msgstr "Porcentaxe de lonxitude" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:247 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132 +msgid "Users" +msgstr "Usuario" + +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:136 msgid "Label Type fields" msgstr "Campos de tipo de etiqueta" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:93 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:96 msgid "Hours Management" msgstr "Administración de horas" -#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:146 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:42 + +msgid "specific allocation" +msgstr "Asignación de recursos" + +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:146 msgid "company name has to be unique. It is already used" msgstr "o nome da empresa debe ser único. Xa está a ser usado" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:206 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:219 +msgid "Template saved" +msgstr "Modelo gardado" + #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:62 msgid "Type of day" msgstr "Tipo de día" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:200 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:213 -msgid "Template saved" -msgstr "Modelo gardado" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:536 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:577 msgid "work report have not any description value with this field name" msgstr "" "o parte de traballo non ten ningún valor de descrición con ees valor de campo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:160 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:162 msgid "User saved" msgstr "Usuario gardado" @@ -4111,34 +4362,29 @@ msgstr "Usuario gardado" msgid "Task quality form name" msgstr "Nombre del formulario de calidad de tarea" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:22 -msgid "NavalPlan: Work report admin query" -msgstr "NavalPlan: Consulta de administración de partes de traballo" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1044 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1045 msgid "Some cost category assignments overlap in time" msgstr "Algunhas asignacións a categorías de coste solápanse no tempo" +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:30 +#: navalplanner-webapp/src/main/webapp/common/error.zul:36 +msgid "Exit session" +msgstr "Saír da sesión" + #: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:30 #: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:52 #: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:66 -#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineGroupTemplate.java:274 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineGroupTemplate.java:274 msgid "Group" msgstr "Grupo" -#: navalplanner-webapp/src/main/webapp/common/error.zul:36 -#: navalplanner-webapp/src/main/webapp/common/event_error.zul:30 -msgid "Exit session" -msgstr "Saír da sesión" - -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:55 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:26 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:62 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:55 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 msgid "Enabled" msgstr "Activado" @@ -4146,11 +4392,15 @@ msgstr "Activado" msgid "Statistics list " msgstr "Lista de estatísticas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:297 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:175 +msgid "All resources must be limiting. " +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:296 msgid "Filter by worker" msgstr "Filtrar por traballadores" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:414 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:441 msgid "" "The task has got advance consolidations.It must delete all consolidations to " "change the resource allocation type " @@ -4162,8 +4412,8 @@ msgstr "" msgid "NavalPlan: Machines" msgstr "NavalPlan: Máquinas" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:43 #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:41 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:43 msgid "Assigned hours" msgstr "Horas asignadas" @@ -4179,41 +4429,41 @@ msgstr "Debe haber alo menos dous tramos para facer interpolación" msgid "Show all labels" msgstr "Mostrar todas as etiquetas" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:297 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:295 msgid "Incompatible update: stored resource is not of type: {0}" msgstr "Actualización incompatible: i recurso almacenado non é de tipo: {0}" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:212 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:75 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:86 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:94 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:112 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:130 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:37 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:41 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:213 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:171 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:86 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:112 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:94 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:40 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:39 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:137 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:82 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:127 #: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:38 #: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:41 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:107 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:75 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:128 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:127 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:137 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:82 msgid "Save & Continue" msgstr "Gardar e continuar" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:45 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:52 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:54 -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:25 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:2 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:2 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:22 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:22 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29 msgid "Filter" msgstr "Filtrar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:581 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:607 msgid "Order saved" msgstr "Pedido gardado" @@ -4221,38 +4471,39 @@ msgstr "Pedido gardado" msgid "Assigned locations" msgstr "Ubicacións asignadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:238 -msgid "Hours worked per worker" -msgstr "Horas traballadas por traballador" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:217 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:238 msgid "Unit type saved" msgstr "Tipo de unidade gardado" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:501 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:557 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:533 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:589 msgid "Order element {0} : OrderLineGroup is incompatible type with {1}" msgstr "" "Elemento de pedido {0} : Grupo de liñas de pedido con tipo incompatible con " "{1}" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:161 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:163 msgid "Two hour costs with the same type overlap in time" msgstr "Dous costes por hora co mesmo tipo solápanse no tempo" -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:63 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:194 + +msgid "Create Machine" +msgstr "Crear máquina" + +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:63 msgid "Ok" msgstr "Aceptar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:54 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:122 msgid "ACWP" msgstr "ACWP" -#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:48 +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:54 msgid "START" msgstr "INICIO" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:406 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:419 msgid "Non limiting resource assignation" msgstr "Asignación de recursos non limitantes" @@ -4266,26 +4517,26 @@ msgstr "Atrás" msgid "Subcontractor" msgstr "Subcontratista" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:220 #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:40 -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:32 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:32 msgid "Administration" msgstr "Administración" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1449 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1612 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:566 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:478 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:567 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1462 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1625 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:875 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1120 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:166 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:281 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:815 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1090 msgid "must be greater than start date" msgstr "debe ser maior que a data de inicio" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:35 -msgid "Work report listing" -msgstr "Listado de partes de traballo" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:84 + +msgid "Create Company" +msgstr "Crear copia" #: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:46 msgid "Cancel and return" @@ -4300,38 +4551,38 @@ msgstr "Asignar formulario de calidade" msgid "Delete item {0}. Are you sure?" msgstr "Borrar elemento {0}. ¿Está seguro?" +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:38 +msgid "worked hours" +msgstr "horas traballadas" + #: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:49 msgid "Unit measure name" msgstr "Nome da unidade de medida" -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:37 -msgid "worked hours" -msgstr "horas traballadas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:451 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:489 msgid "a work report line has not this label type assigned" msgstr "unha liña de parte de traballo non ten este tipo de etiqueta asignado" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:90 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:71 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:74 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:94 msgid "Allocations" msgstr "Asignacións" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:122 -msgid "Length" -msgstr "Lonxitude" - -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:33 #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:83 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:33 msgid "Capacity" msgstr "Capacidade" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:177 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:126 +msgid "Length" +msgstr "Lonxitude" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:337 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:177 msgid "Create derived" msgstr "Crear derivado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:476 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:479 msgid "it must be greater than zero" msgstr "debe ser maior que cero" @@ -4347,15 +4598,25 @@ msgstr "Non se fixeron asignacións" msgid "Removed calendar \"{0}\"" msgstr "Borrado calendario \"{0}\"" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:103 msgid "START_IN_FIXED_DATE" msgstr "COMEZAR_EN_DATA_FIXA" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:74 +#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:21 + +msgid "Unit Types List" +msgstr "Lista de tipos de unidades" + +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:37 + +msgid "Edit Criterion Type" +msgstr "Engadir criterio" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:76 msgid "as soon as possible" msgstr "tan pronto como sexa posible" -#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:163 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:163 msgid "company NIF has to be unique. It is already used" msgstr "o NIF da empresa debe ser único. Xa está a ser usado" @@ -4365,7 +4626,7 @@ msgstr "" "Horas humanas por hora de traballo de máquina dentro de unidade de " "configuración" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:110 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:112 msgid "" "Could not add those authorizations to user {0} because they were already " "present." @@ -4373,8 +4634,8 @@ msgstr "" "Non se engadiron esas actualizacións ao usuario {0} porque xa estaban " "presentes." +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:102 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:46 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:101 msgid "New work report" msgstr "Novo parte de traballo" @@ -4382,15 +4643,15 @@ msgstr "Novo parte de traballo" msgid "A3" msgstr "A3" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:90 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:110 msgid "Select gap" msgstr "Seleccionar intervalo" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:61 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:62 msgid "Date Finish" msgstr "Data de fin" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:219 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:94 msgid "Validate" msgstr "Validar" @@ -4400,17 +4661,22 @@ msgstr "Validar" msgid "Edit order element" msgstr "Editar elemento de pedido" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:34 -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:3 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:142 + +msgid "This resource has already been added." +msgstr "A categoría de coste xa fora borrada." + #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:23 msgid "Cost category assignment" msgstr "Asignación de categoría de coste" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:145 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:149 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:487 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:493 msgid "All workers" msgstr "Todos os traballadores" @@ -4418,58 +4684,72 @@ msgstr "Todos os traballadores" msgid "Label saved" msgstr "Etiqueta gardada" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:5 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:3 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:3 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector_combo.zul:30 + +msgid "Select criteria or resources" +msgstr "Filtrar por recursos" + +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:25 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:23 msgid "Select required criteria set and press filter button" msgstr "Seleccione conxunto de criterios requeridos e pulse o botón de filtrar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:173 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:174 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:175 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:302 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:265 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:280 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:309 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:266 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:175 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:176 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:177 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:302 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:114 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:133 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:42 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:68 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:48 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:127 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:46 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:42 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:43 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:54 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:42 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:48 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:96 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:68 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:46 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:127 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:48 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:39 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:38 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:134 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:92 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:40 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:44 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:42 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:32 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:43 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:49 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:82 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:86 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:42 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:43 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:54 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:18 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:20 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:32 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:39 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:44 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:42 msgid "cannot be null or empty" msgstr "non pode ser nulo ou baleiro" +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21 + +msgid "NavalPlan: Work And Progress Per Project" +msgstr "NavalPlan: Informe de progreso de traballo" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:51 #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:61 msgid "New code" msgstr "Novo código" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:404 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:409 msgid "Calculate Resources per Day" msgstr "Calcular recursos por día" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:990 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:993 msgid "The index fields and labels must be uniques and consecutives" msgstr "Os campos de índice e as etiquetas deben ser únicas e consecutivas" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:129 +msgid "Estimate To Complete" +msgstr "Estimación do coste pendente" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:249 msgid "" "Are you sure of changing the resource type? You will lose the criterions " @@ -4478,30 +4758,26 @@ msgstr "" "¿Está seguro de cambiar o tipo de recurso? Os criterios con diferente tipo " "de recurso perderanse." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:61 -msgid "Estimate To Complete" -msgstr "Estimación do coste pendente" +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:21 +msgid "NavalPlan: Estimated/Planned Hours Per Task" +msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:511 msgid "Cannot delete that material because it is assigned to an order." msgstr "Non se pode borrar ese material porque está a asignado a un pedido." -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:88 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:9 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:10 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:29 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:84 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:109 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:30 msgid "Unit type" msgstr "Tipo de unidade" -#: navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:22 -msgid "NavalPlan: Type of work hours" -msgstr "NavalPlan: Tipos de horas de traballo" - #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:41 msgid "Load due to other assignments" msgstr "Carga debido a outras asignacións" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:204 msgid "Order: {0} " msgstr "Pedido: {0} " @@ -4509,19 +4785,31 @@ msgstr "Pedido: {0} " msgid "This machine was already removed by other user" msgstr "Esta máquina xa foi borrada por outro usuario" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:234 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:260 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:264 + +msgid "Work Reports" +msgstr "Parte de traballo" + #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:25 msgid "Calendar data" msgstr "Datos do calendario" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:140 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:140 msgid "login name is already being used by another user" msgstr "o nome de usuario xa está sendo usado" -#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:106 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:21 + +msgid "Cost Categories List" +msgstr "Listado de categorías de coste" + +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:106 msgid "code is already used" msgstr "o código xa está a ser usado" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:67 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:71 msgid "Task start :" msgstr "Inicio da tarefa :" @@ -4529,30 +4817,36 @@ msgstr "Inicio da tarefa :" msgid "Criterion Requirements" msgstr "Criterios requiridos" +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:110 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:122 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:151 +msgid "Workable Time" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:702 msgid "Calculated advances can not be removed" msgstr "Os avances calculados non se poden borrar" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:21 -msgid "External companies listing" -msgstr "Listado de empresas externas" - #: navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java:210 msgid "Order from client" msgstr "Pedido de cliente" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:167 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:49 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:68 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:68 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:168 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:126 msgid "OrderElement Code" msgstr "Código do elemento de pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:231 -msgid "Manage user profiles" -msgstr "Administrar perfís de usuario" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:32 + +msgid "Customer Reference" +msgstr "Referencia del cliente" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:125 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:138 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:617 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:643 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" @@ -4561,11 +4855,11 @@ msgstr "" msgid "Create and assign label" msgstr "Crear e asignar etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:56 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 msgid "SV" msgstr "SV" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1401 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1414 msgid "Filter work reports" msgstr "Filtrar partes de traballo" @@ -4573,10 +4867,6 @@ msgstr "Filtrar partes de traballo" msgid "Our company login" msgstr "Nome de usuario da nosa empresa" -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:21 -msgid "Cost categories listing" -msgstr "Listado de categorías de coste" - #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:26 msgid "Direct imputation" msgstr "Imputación directa" @@ -4585,7 +4875,7 @@ msgstr "Imputación directa" msgid "Price per hour" msgstr "Prezo por hora" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:250 msgid "Calendars" msgstr "Calendarios" @@ -4593,31 +4883,28 @@ msgstr "Calendarios" msgid "NavalPlan: Page not found" msgstr "NavalPlan: Páxina non atopada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:323 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:330 msgid "The date cannot be null" msgstr "A data non pode ser nula" -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:22 -msgid "NavalPlan: Work report types" -msgstr "NavalPlan: Tipos de partes de traballo" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:392 msgid "Error on showing delete confirm" msgstr "Erro ao mostrar a confirmación de borrado" -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:10 -msgid "Show only current satisfied criteria" -msgstr "Mostrar só os criterios satisfeitos actualmente" - -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:69 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:89 msgid "Latest date" msgstr "Data máis tardía" -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:21 -msgid "Users listing" -msgstr "Listado de usuarios" +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:30 +msgid "Show only current satisfied criteria" +msgstr "Mostrar só os criterios satisfeitos actualmente" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:650 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:21 + +msgid "NavalPlan: Advances" +msgstr "NavalPlan: Tipos de avance" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:666 msgid "Sum of all rows" msgstr "Suma de todas as filas" @@ -4633,14 +4920,20 @@ msgstr "Hora de fin" msgid "Done {0} of {1}" msgstr "Feito {0} de {1}" +#: navalplanner-webapp/src/main/webapp/users/users.zul:22 + +msgid "NavalPlan: Accounts" +msgstr "NavalPlan: Contas de usuario" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:337 -#: navalplanner-business/src/main/java/org/navalplanner/business/common/daos/OrderSequenceDAO.java:72 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/common/daos/OrderSequenceDAO.java:72 msgid "You can not remove this order sequence, it is already in use" msgstr "Non se pode borrar esta secuencia de pedido, está a ser usada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:153 -msgid "Edit label type" -msgstr "Editar tipo de etiqueta" +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:22 + +msgid "NavalPlan: Scenarios Management" +msgstr "NavalPlan: planificación" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:138 msgid "" @@ -4654,9 +4947,9 @@ msgstr "" msgid "Each worker configuration unit name" msgstr "Nome da unidade de configuración de cada traballador" +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:132 #: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:40 #: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:41 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:132 msgid "Active" msgstr "Activo" @@ -4665,8 +4958,8 @@ msgstr "Activo" msgid "Value is not valid, the current value must be not empty" msgstr "O valor non é válido, o valor actual non debe estar baleiro" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:285 #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:545 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:285 msgid "Unindent" msgstr "Desindentar" @@ -4674,7 +4967,7 @@ msgstr "Desindentar" msgid "Direct labels" msgstr "Etiquetas directas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:157 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:161 msgid "Delete order element" msgstr "Borrar elemento de pedido" @@ -4682,7 +4975,8 @@ msgstr "Borrar elemento de pedido" msgid "Log in" msgstr "Entrar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:56 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:294 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:312 msgid "Order Scheduling" msgstr "Planificación de pedidos" @@ -4694,10 +4988,15 @@ msgstr "Precisión" msgid "Date last advance measurement" msgstr "Data da última medida de avance" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:339 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:372 msgid "missing code in a work report line" msgstr "falta código nunha liña de parte de traballo" +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:21 + +msgid "NavalPlan: Subcontracted Tasks" +msgstr "NavalPlan: Tarefas subcontratadas" + #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:28 msgid "Indirect labels" msgstr "Etiquetas indirectas" @@ -4706,14 +5005,14 @@ msgstr "Etiquetas indirectas" msgid "Scheduling state" msgstr "Estado de planificación" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:135 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:70 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:50 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:48 -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:43 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:64 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:51 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:70 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:50 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:136 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:43 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:60 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:51 msgid "Generate code" msgstr "Xerar código" @@ -4729,16 +5028,17 @@ msgstr "" msgid "Select print page properties" msgstr "Seleccione as propiedades da páxina de impresión" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:211 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21 + +msgid "NavalPlan: Project Costs Per Resource" +msgstr "NavalPlan: Recursos" + +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:211 msgid "criterion satisfaction's criterion not specified" msgstr "criterio do criterio satisfeito non especificado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:290 -msgid "Machine" -msgstr "Máquina" - -#: navalplanner-webapp/src/main/webapp/common/error.zul:35 #: navalplanner-webapp/src/main/webapp/common/event_error.zul:29 +#: navalplanner-webapp/src/main/webapp/common/error.zul:35 msgid "Reload" msgstr "Recargar" @@ -4754,34 +5054,38 @@ msgstr "" msgid "Edit order element {0}" msgstr "Editar elemento de pedido {0}" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:233 + +msgid "Virtual Workers Groups" +msgstr "Grupos virtuais de traballadores" + #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:25 msgid "Profiles authorization" msgstr "Autorización de perfís" +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:90 +msgid "Assignation" +msgstr "Asignación" + #: navalplanner-webapp/src/main/webapp/common/configuration.zul:98 msgid "Planning charts expanded" msgstr "Gráficas de planificación expandidas" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:79 -msgid "Assignation" -msgstr "Asignación" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1263 +msgid "Add new advance measurement" +msgstr "Engadir nova medida de avance" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:425 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:316 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:45 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:428 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:45 msgid "Not deletable" msgstr "Imborrable" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:148 -msgid "Create quality form" -msgstr "Crear formulario de calidade" - -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:71 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:34 #: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:26 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:45 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:77 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:71 msgid "NIF" msgstr "NIF" @@ -4793,11 +5097,16 @@ msgstr "" "Os modelos só poden crearse a partir de elementos de pedido existentes.\n" "Non se poden usar elementos de pedido novos." +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39 + +msgid "Edit Advance Type" +msgstr "Editar datos do tipo de avance" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:168 msgid "Doing {0} reassignations" msgstr "Realizando {0} reasignacións" -#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:45 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:45 msgid "code not specified" msgstr "código non especificado" @@ -4805,42 +5114,47 @@ msgstr "código non especificado" msgid "Confirmation" msgstr "Confirmación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:186 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:187 msgid "" "Cannot delete work report type. There are some work reports bound to it." msgstr "" "Non se pode borrar o tipo de parte de traballo. Hai algún parte de traballo " "ligado a el." +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:21 + +msgid "Criterion Type List" +msgstr "Lista de tipos de criterio" + #: navalplanner-webapp/src/main/webapp/common/layout/login.zul:73 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:47 msgid "Password" msgstr "Contrasinal" -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:87 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 msgid "Observations" msgstr "Observacións" #: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:26 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:163 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:185 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:209 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:162 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:184 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:208 msgid "Valid from" msgstr "Válido desde" +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:56 +msgid "Month" +msgstr "Mes" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:289 msgid "There exists other template with the same name." msgstr "Xa existe outro modelo co mesmo nome." -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:214 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:204 msgid "exception date already exists" msgstr "a data de excepción xa existe" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:56 -msgid "Month" -msgstr "Mes" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:733 msgid "Advanced assignment saved" msgstr "Asignación avanzada gardada" @@ -4849,7 +5163,7 @@ msgstr "Asignación avanzada gardada" msgid "At least one order sequence is needed" msgstr "Necesítase alo menos unha secuencia de pedido" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:777 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:808 msgid "Edit order" msgstr "Editar pedido" @@ -4859,21 +5173,26 @@ 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 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:194 msgid "criterion satisfaction's start date not specified" msgstr "data de inicio do criterio satisfeito non especificada" +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:36 + +msgid "Create Advance Type" +msgstr "Crear un novo tipo de avance" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:50 #: navalplanner-webapp/src/main/webapp/common/layout/template.zul:87 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:130 +#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:47 +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:77 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:59 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:114 #: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:38 #: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:42 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:82 -#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:47 #: navalplanner-webapp/src/main/webapp/planner/main.zul:65 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:85 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:99 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:154 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:110 msgid "Accept" msgstr "Aceptar" @@ -4888,12 +5207,13 @@ msgstr "" "Crear nova asignación de material fóra da asignación de material {0}. ¿Está " "seguro?" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:238 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:261 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:239 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:262 +#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:39 msgid "Edit Worker" msgstr "Editar traballador" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:192 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:193 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:151 msgid "Work report lines" msgstr "Liñas do parte de traballo" @@ -4902,17 +5222,17 @@ msgstr "Liñas do parte de traballo" msgid "Calculated" msgstr "Calculado" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:202 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:206 msgid "Completed: {0}% " msgstr "Completado: {0}% " -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:116 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:114 msgid "Error setting up edition form for Criterion Type with id: {0}" msgstr "" "Erro preparando o formulario de edición para o tipo de criterio con id: {0}" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:592 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:528 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:550 msgid "" "Confirm creating a new order version for this scenario and derived. Are you " "sure?" @@ -4920,8 +5240,8 @@ msgstr "" "Confirmar a creación dunha nova versión de pedido para este escenario e " "derivados. ¿Está seguro?" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:309 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:315 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:328 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:334 msgid " The " msgstr " O " @@ -4929,17 +5249,17 @@ msgstr " O " msgid "Access to the system" msgstr "Acceso ao sistema" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:107 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:122 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:140 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:111 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:143 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:117 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:207 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179 msgid "Click on " msgstr "Click en" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:110 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:111 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:99 msgid "Report data" msgstr "Datos do informe" @@ -4957,11 +5277,7 @@ msgstr "Elementos de pedido" msgid "Report advance" msgstr "Notificar avance" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/InstanceNotFoundRecoverableErrorException.java:45 -msgid "instance not found" -msgstr "instancia non atopada" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:81 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:92 msgid "Priority" msgstr "Prioridade" @@ -4969,51 +5285,54 @@ msgstr "Prioridade" msgid "Landscape" msgstr "Apaisado" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:392 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/InstanceNotFoundRecoverableErrorException.java:45 +msgid "instance not found" +msgstr "instancia non atopada" + +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:409 msgid "criterion names must be unique inside a criterion type" msgstr "o nome do criterio debe ser único dentro dun tipo de criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:760 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:78 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplateFinder.java:51 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:63 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:130 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:50 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:65 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:78 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:776 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:39 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:65 #: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:39 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:35 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:43 #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:33 -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:35 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:63 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:85 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:46 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:74 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:26 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:25 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:39 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:74 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:85 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:89 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:110 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:55 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:74 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:7 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:45 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:25 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:81 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:7 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:72 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:27 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:83 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:120 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:98 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:95 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:50 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:64 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:131 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:35 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:59 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:81 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:107 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:72 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:27 #: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:48 #: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:52 #: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:74 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:26 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:46 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:74 msgid "Code" msgstr "Código" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:10 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:30 msgid "Filters" msgstr "Filtros" @@ -5021,30 +5340,27 @@ msgstr "Filtros" msgid "Add stretch" msgstr "Engadir tramo" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:78 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:89 msgid "Assignation type" msgstr "Tipo de asignación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:216 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:201 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:220 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:235 msgid "" "Start date is not valid, the new start date must be lower than the end date" msgstr "" "A data de inicio non é válida, a data de inicio nova debe ser anterior á " "data de fin" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:501 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:934 -msgid "Hours for an exception day should be greater or equal than zero" -msgstr "As horas para un día de excepción deben ser maiores o iguais a cero" - #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:52 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:86 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:121 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:57 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:100 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:96 msgid "Start date" msgstr "Data de inicio" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:133 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:132 msgid "Update exception" msgstr "Actualizar excepción" @@ -5067,18 +5383,23 @@ msgid "Unit name" msgstr "Nome da unidade" #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:56 msgid "Write" msgstr "Escribir" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:373 -msgid "Assign element to queue automatically" -msgstr "Asignar elemento á cola automáticamente" +#: navalplanner-webapp/src/main/webapp/labels/labelTypes.zul:20 + +msgid "NavalPlan: Labels" +msgstr "NavalPlan: Tipos de etiqueta" #: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:38 msgid "Number of applications" msgstr "Número de aplicacións" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:461 +msgid "Assign element to queue automatically" +msgstr "Asignar elemento á cola automáticamente" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:42 msgid "Filter type" msgstr "Tipo de filtro" @@ -5091,12 +5412,20 @@ msgstr "" "Data despois da cal a tarefa debe empezar (presione enter no cadro de texto " "para abrir o calendario ou escriba a data directamente)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:192 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:450 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:465 msgid "Normal" msgstr "Normal" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:282 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1286 +msgid "" +"This advance can not be removed, because it is spread. It is necessary to " +"select another advance as spread." +msgstr "" +"Este avance non se pode eliminar porque é propagado. Cómpre seleccionar " +"outro avance como propagado" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:289 msgid "Date cannot be null" msgstr "A data non pode ser nula" @@ -5105,30 +5434,35 @@ msgstr "A data non pode ser nula" msgid "Advance type" msgstr "Tipo de avance" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:741 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:94 + +msgid "Create Profile" +msgstr "Crear derivado" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:744 msgid "This label type already is assigned to the work report type." msgstr "Este tipo de etiqueta xa está asignado ao tipo de parte de traballo." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:512 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:286 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:461 -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:48 -msgid "Load" -msgstr "Carga" - #: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:27 msgid "New criterion" msgstr "Criterio novo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:839 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:61 -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:62 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:332 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:461 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:511 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:48 +msgid "Load" +msgstr "Carga" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:882 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:61 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:59 #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:35 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:86 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:62 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:31 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:82 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:112 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:38 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:58 #: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:40 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:46 @@ -5139,55 +5473,69 @@ msgstr "Descrición" msgid "Expand all taskgroups" msgstr "Expandir todos os grupos de tarefas" -#: navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:22 -msgid "NavalPlan: External companies" -msgstr "NavalPlan: Empresas externas" - -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:22 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:22 msgid "NavalPlan: Criteria" msgstr "NavalPlan: Criterios" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:133 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:145 msgid "Go to advanced Allocation" msgstr "Ir a asignación avanzada" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:505 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:508 msgid "already exists an allocation for criteria {0}" msgstr "xa existe unha asignación para os criterios {0}" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:453 -msgid "Invalid queue element" -msgstr "Elemento de cola inválido" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:228 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:270 + +msgid "Project Templates" +msgstr "Crear modelo" #: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:42 msgid "Number of finished applications" msgstr "Número de aplicacións finalizadas" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:478 +msgid "Invalid queue element" +msgstr "Elemento de cola inválido" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:566 #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:575 #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:583 msgid "Unnasigned" msgstr "Non asignado" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:100 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:110 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:135 + +msgid "please, select a order" +msgstr "Por favor, seleccione un pedido" + +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:64 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:61 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:156 +msgid "User" +msgstr "Usuario" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:402 msgid "At least one HoursGroup is needed" msgstr "É necesario alo menos un HoursGroup" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:61 -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:64 -#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:156 -msgid "User" -msgstr "Usuario" - #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:69 msgid "Interacts with applications" msgstr "Interactúa con aplicacións" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:256 + +msgid "Virtual worker" +msgstr "Lista de traballadores virtuais" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:168 msgid "Order {0} transfered" msgstr "Pedido {0} transferido" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:46 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:46 msgid "Multiple values per resource" msgstr "Múltiples valores por recurso" @@ -5195,16 +5543,12 @@ msgstr "Múltiples valores por recurso" msgid "Hours:" msgstr "Horas:" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:37 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:42 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:57 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:63 msgid "Split" msgstr "Dividir" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:33 -msgid "Work report lines listing" -msgstr "Listado de liñas de parte de traballo" - -#: navalplanner-webapp/src/main/webapp/planner/order.zul:171 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:131 msgid "Select the calendar" msgstr "Seleccionar o calendario" @@ -5216,7 +5560,24 @@ msgstr "" "Esta medida de avance non pode ser cambiada ou borrada, porque está " "consolidada. Débese borrar a consolidación." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:719 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:67 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:24 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:27 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:86 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:44 +msgid "Starting date" +msgstr "Data de inicio" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:134 +msgid "Order sequence prefixes can not be repeated" +msgstr "Os prefixos das secuencias de pedido non poden repetirse" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:745 msgid "" "You can not remove the order \"{0}\" because of any of its order elements " "are already in use in some work reports and the order just exists in the " @@ -5226,87 +5587,69 @@ msgstr "" "elementos está a usarse nalgún parte de traballo e o pedido só existe no " "escenario actual" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:134 -msgid "Order sequence prefixes can not be repeated" -msgstr "Os prefixos das secuencias de pedido non poden repetirse" - -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:27 -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:32 -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:67 -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:18 -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:24 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:22 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:86 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:24 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:29 -msgid "Starting date" -msgstr "Data de inicio" - -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 -msgid "NavalPlan: Timeline material report" -msgstr "NavalPlan: Informe de materiais ao longo do tempo" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:965 msgid "Function" msgstr "Función" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:85 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:98 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:119 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:89 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:121 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:95 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:85 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:550 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:557 +msgid "Repeated Order code {0} in Order {1}" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:171 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:141 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:187 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:160 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:139 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:198 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157 msgid "Format" msgstr "Formato" -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:21 -msgid "Workers list" -msgstr "Lista de traballadores" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:93 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:529 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:68 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:644 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1010 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:487 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:370 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:36 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:76 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:39 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:88 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:32 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:39 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:41 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:49 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:48 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:42 -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:23 -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:24 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:36 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:72 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:704 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1040 #: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:40 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:36 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:37 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:41 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:47 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:48 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:77 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:36 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:88 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:23 #: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:34 #: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:36 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:48 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:24 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:36 msgid "Edit" msgstr "Editar" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:165 + +msgid "Edit Unit Type" +msgstr "Tipos de unidade" + #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:96 msgid "Responsible" msgstr "Responsable" -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:15 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:67 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:35 msgid "Init date" msgstr "Data de inicio" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:153 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:152 msgid "By default" msgstr "Por defecto" @@ -5319,7 +5662,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:1119 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1120 msgid "" "resources cost category assignment codes must be unique inside a resource" msgstr "" @@ -5331,7 +5674,7 @@ msgstr "" msgid "XML" msgstr "XML" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:165 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:184 msgid "" "CriterionType is not valid, the criterionType overlap other " "criterionSatisfaction whith same criterionType" @@ -5343,10 +5686,10 @@ msgstr "" msgid "Unable to convert {0} value to {1} type" msgstr "Non se puido convertir o valor {0} ao tipo {1}" -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:87 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:10 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:11 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:83 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:110 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:31 msgid "Unit price" msgstr "Prezo da unidade" @@ -5358,13 +5701,13 @@ msgstr "Data de comunicación" msgid "Reassigning" msgstr "Reasignando" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:470 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:471 msgid "" "Cannot delete that cost category because there are resources assigned to it." msgstr "" "Non se pode borrara categoría de coste porque hai recursos asignados a ela." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:481 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:484 msgid "{0} already assigned to resource allocation list" msgstr "{0} xa está na lista de asignación de recursos" @@ -5372,32 +5715,49 @@ msgstr "{0} xa está na lista de asignación de recursos" msgid "Unit Measure" msgstr "Unidade de medida" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:400 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:407 msgid "The type of hours cannot be null." msgstr "O tipo de horas no pode ser nulo." +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:21 + +msgid "Label Types List" +msgstr "Campos de tipo de etiqueta" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:53 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:52 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:40 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:62 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:126 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionBandboxFinder.java:46 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:65 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:40 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:42 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:172 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:24 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:35 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:110 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:151 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:95 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:125 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:165 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:140 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:137 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:178 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:40 -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:58 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:65 -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:35 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:24 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:42 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:41 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:63 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:127 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:40 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:46 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:152 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:40 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:42 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:173 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:52 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:46 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:58 msgid "Type" msgstr "Tipo" @@ -5413,11 +5773,11 @@ msgstr "" msgid "Associated Criteria" msgstr "Criterios asignados" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:53 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:121 msgid "BCWS" msgstr "BCWS" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:280 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:319 msgid " in the specified directory." msgstr " no directorio especificado." @@ -5425,51 +5785,55 @@ msgstr " no directorio especificado." msgid "Autogenerated" msgstr "Autoxerado" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1113 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1114 msgid "criterion satisfaction codes must be unique inside a resource" msgstr "o código do criterio debe ser único dentro dun recurso" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:240 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 -msgid "Working progress per task" -msgstr "Progreso de traballo por tarefa" - #: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:30 msgid "New order element name:" msgstr "Nome do novo elemento de pedido:" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:37 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:359 + +msgid "missing code in a work report." +msgstr "falta código nunha liña de parte de traballo" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:36 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:73 msgid "Criterion" msgstr "Criterio" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:228 -msgid "Manage types of work hours" -msgstr "Administrar tipos de horas de traballo" - #: navalplanner-webapp/src/main/webapp/common/configuration.zul:65 msgid "Generate code for" msgstr "Xerar código para" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:45 msgid "Limiting resources (order)" msgstr "Recursos limitantes (pedido)" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:364 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:443 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:397 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:481 #: navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/impl/LabelConverter.java:102 msgid "missing code in a label" msgstr "falta o código nunha etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:54 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:122 msgid "Actual Cost Work Performed" msgstr "Coste de traballo realizado" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:246 + +msgid "NavalPlan Configuration" +msgstr "NavalPlan: Configuración" + #: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:50 msgid "Average of the worked hours" msgstr "Media de horas traballadas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:488 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:548 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" @@ -5479,7 +5843,7 @@ msgstr "" " O código non pode conter caracteres como '_' \n" " e non debe ser baleiro" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorization.java:42 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorization.java:42 msgid "an authorization type must be set" msgstr "Debe seleccionar un tipo de autorización" @@ -5487,43 +5851,61 @@ 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)" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:123 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:48 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:78 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:140 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:85 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:115 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:154 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:88 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:129 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:88 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:167 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:86 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:44 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:74 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:34 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:165 msgid "Add" msgstr "Engadir" -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:51 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:104 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:124 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:47 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:73 msgid "Unselect" msgstr "Deseleccionar" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:464 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:479 msgid "You should select the type of exception" msgstr "Debe seleccionar o tipo de excepción" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:92 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:41 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:91 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:31 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:91 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:51 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:41 msgid "Deadline" msgstr "data límite" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:704 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:730 msgid "You don't have permissions to edit this order" msgstr "Non ten permisos para editar este pedido" -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:102 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:122 msgid "Filter by categories or materials" msgstr "Filtrar por categorías ou materiais" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:106 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:237 + +msgid "Subcontracted Tasks" +msgstr "Lista de tarefas subcontratadas" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:320 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:106 msgid "Advance measurements" msgstr "Medidas de avance" @@ -5535,24 +5917,31 @@ msgstr "A porcentaxe de cantidade de traballo debe estar entre 0 y 100" msgid "Machine data" msgstr "Datos da máquina" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:59 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:127 msgid "VAC" msgstr "VAC" -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:27 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:33 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:54 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:27 msgid "Label type" msgstr "Tipo de etiqueta" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:245 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:189 msgid "Advanced Allocation" msgstr "Asignación avanzada" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:245 + +msgid "Administration / Management" +msgstr "Administración" + #: navalplanner-webapp/src/main/webapp/templates/templates.zul:58 msgid "Template Tree" msgstr "Árbore de modelos" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:505 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:33 msgid "Alpha" msgstr "Alfa" @@ -5562,12 +5951,12 @@ msgstr "Alfa" msgid "inconsistent parent code." msgstr "código pai inconsistente." -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:80 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:84 msgid "Recommended Allocation" msgstr "Asignación recomendada" #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:67 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:14 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:34 msgid "Status" msgstr "Estado" @@ -5575,35 +5964,29 @@ msgstr "Estado" msgid "Resource load view" msgstr "Vista de carga de recursos" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:21 -msgid "NavalPlan: Hours worked report" -msgstr "NavalPlan: Informe de horas traballadas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:752 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:959 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:59 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:768 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:69 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:959 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:73 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:53 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:91 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:49 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:43 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:98 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:68 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:75 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:50 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:80 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:16 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:110 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:123 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:152 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:47 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:110 msgid "Hours" msgstr "Horas" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:575 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:562 msgid "the date must be inside the visualization area" msgstr "a data debe estar dentro da área de visualización" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:372 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:405 msgid "work report has not this label type assigned" msgstr "o parte de traballo non ten este tipo de etiqueta asignado" @@ -5623,10 +6006,17 @@ msgstr "Tipo de formulario de calidade" msgid "The name of the criterion is empty." msgstr "O nome do criterio está baleiro." -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:345 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:354 msgid " hours" msgstr " horas" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:227 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:137 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:151 + +msgid "Limiting Resources Planning" +msgstr "Asignación de recursos limitantes" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:740 msgid "The max value must be not empty" msgstr "O valor máximo non pode ser baleiro" @@ -5635,13 +6025,13 @@ msgstr "O valor máximo non pode ser baleiro" msgid "New label" msgstr "Nova etiqueta" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:327 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:331 +#: 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" msgstr "A data de inicio non pode ser nula" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:64 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:55 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:75 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:68 msgid "Allocation configuration" msgstr "Configuración de asignación" @@ -5649,38 +6039,30 @@ msgstr "Configuración de asignación" msgid "Scenario \"{0}\" saved" msgstr "Escenario \"{0}\" gardado" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:31 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:51 msgid "Subcontract price" msgstr "Prezo de subcontratación" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:251 -msgid "Edit virtual worker groups" -msgstr "Editar grupos virtuais de traballadores" +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:23 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:21 +msgid "Assigned criteria" +msgstr "Criterios asignados" #: navalplanner-webapp/src/main/webapp/common/layout/login.zul:47 msgid "Help on authentication (opens a new window)" msgstr "Axuda sobre a identificación (abre unha ventana nova)" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:30 -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:1 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:3 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:29 -msgid "Assigned criteria" -msgstr "Criterios asignados" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:864 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:867 msgid "The length must be greater than 0, and not null." msgstr "A lonxitude debe ser maior que cero e non nula." -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:21 -msgid "Machines list" -msgstr "Lista de máquinas" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:479 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:490 msgid "Could not save new calendar" msgstr "Non se puido gardar o calendario novo" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:132 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:151 msgid "Deleted unit type {0}" msgstr "Borrado tipo de unidade {0}" @@ -5688,6 +6070,11 @@ msgstr "Borrado tipo de unidade {0}" msgid "All advance types have already been assigned." msgstr "Xa se asignaron tódolos tipos de avance." +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:21 + +msgid "Advance Types List" +msgstr "Lista de tipos de avance" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:135 msgid "Couldn't find criterion {0}" msgstr "Non se puido atopar o criterio {0}" @@ -5696,40 +6083,44 @@ msgstr "Non se puido atopar o criterio {0}" msgid "Could not save the scenario" msgstr "Non se puido gardar o escenario" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:196 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:329 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:270 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41 + +msgid "Task Scheduling Status In Project" +msgstr "Estado das tarefas de planificacion dun pedido" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:197 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:353 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:40 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:329 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:40 msgid "Confirm" msgstr "Confirmar" -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:55 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:35 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:51 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:62 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:61 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:50 -#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:31 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:32 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:47 #: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:49 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:48 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:59 -#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:31 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:50 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:61 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:63 #: navalplanner-webapp/src/main/webapp/calendars/_list.zul:31 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:31 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:55 +#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:31 #: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:48 #: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:44 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:59 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:32 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:47 msgid "Create" msgstr "Crear" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:41 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:78 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 msgid "Permissions" msgstr "Permisos" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1646 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1652 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1659 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1665 msgid "please, select a work report type" msgstr "por favor, seleccione un tipo de parte de traballo" @@ -5737,178 +6128,234 @@ msgstr "por favor, seleccione un tipo de parte de traballo" msgid "List of materials for category: {0}" msgstr "Lista de materiais para a categoría: {0}" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:11 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:12 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:32 msgid "Total price" msgstr "Prezo total" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:221 -msgid "Manage advance types" -msgstr "Xestionar tipos de avance" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1149 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1161 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:430 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:313 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:728 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:598 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:262 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:283 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:248 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:413 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:427 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:140 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:160 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:247 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:412 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:426 #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:583 #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:589 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:366 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:673 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:313 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:598 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:736 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:651 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:863 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1056 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:231 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1161 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1173 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:433 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:262 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:283 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:387 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1255 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:199 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:384 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1255 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1026 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:647 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:859 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1062 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:177 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:42 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:82 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:42 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:50 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:65 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:54 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:69 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1056 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:179 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:689 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:366 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:42 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:68 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:116 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:131 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:89 #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:53 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:107 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:90 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:41 -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:41 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:53 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:90 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:39 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:54 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:85 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:50 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:45 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:54 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:120 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:161 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:135 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:175 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:109 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:150 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:110 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:106 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:147 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:188 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:83 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:42 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:103 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:66 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:78 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:101 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:90 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:101 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:66 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:53 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:109 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:39 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:60 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:90 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:120 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:39 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:66 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:53 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:109 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:41 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:90 msgid "Delete" msgstr "Borrar" -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:30 -msgid "Number of assigned hours." -msgstr "Número de horas asignadas." - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:31 -msgid "Number of hours calculated by clock." -msgstr "Número de horas calculadas en base a reloxo." - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:32 -msgid "Number of assigned hours and the time." -msgstr "Número de horas asignadas e hora." - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:33 -msgid "heading" -msgstr "cabeceira" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:33 -msgid "line" -msgstr "liña" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:32 -msgid "RESOURCE" -msgstr "RECURSO" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:33 -msgid "WORKER" -msgstr "TRABALLADOR" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:34 -msgid "MACHINE" -msgstr "MÁQUINA" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1144 -msgid "yes" -msgstr "si" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1144 -msgid "no" -msgstr "non" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:53 -msgid "[generic all workers]" -msgstr "[xenérico todos os traballadores]" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:71 -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:112 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:71 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:112 msgid "You can not modifiy this order sequence, it is already in use" msgstr "Non se pode modificar esta secuencia de pedido, está a ser usada" -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:121 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:121 #, java-format msgid "number of digits must be between {0} and {1}" msgstr "o número de díxitos debe estar entre {0} e{1}" -#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java:121 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:34 +msgid "WORK_RELATIONSHIP" +msgstr "RELACIÓN LABORAL" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:40 +msgid "LOCATION_GROUP" +msgstr "LOCALIZACIÓN / GRUPO" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:46 +msgid "LEAVE" +msgstr "BAIXA" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:52 +msgid "TRAINING" +msgstr "FORMACIÓN" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:58 +msgid "JOB" +msgstr "TRABALLO" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:64 +msgid "CATEGORY" +msgstr "CATEGORÍA" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:53 +msgid "[generic all workers]" +msgstr "[xenérico todos os traballadores]" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:32 +msgid "RESOURCE" +msgstr "RECURSO" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:33 +msgid "WORKER" +msgstr "TRABALLADOR" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:34 +msgid "MACHINE" +msgstr "MÁQUINA" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1145 +msgid "yes" +msgstr "si" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1145 +msgid "no" +msgstr "non" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java:121 msgid "Line" msgstr "Liña" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueDependency.java:124 -msgid "A queue dependency has to have an origin different from destiny" -msgstr "A dependencia de cola debe ter unha orixe diferente do destino" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:30 -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/QueuePosition.java:52 -msgid "Hour should be a value between 0 and 23" -msgstr "A hora debe ser un valor entre 0 e 23" +msgid "Number of assigned hours" +msgstr "Número de horas asignadas." -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31 -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:29 -msgid "Pending" -msgstr "Pendente" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:31 -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31 -msgid "Failed sent" -msgstr "Fallo no envío" +msgid "Number of hours calculated by clock" +msgstr "Número de horas calculadas en base a reloxo." -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:32 -msgid "Success sent" -msgstr "Éxito no envío" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:32 -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:27 -msgid "Finished" -msgstr "Rematado" +msgid "Number of assigned hours and the time" +msgstr "Número de horas asignadas e hora." -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:28 -msgid "In progress" -msgstr "En progreso" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:33 +msgid "heading" +msgstr "cabeceira" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:30 -msgid "Blocked" -msgstr "Bloqueado" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:33 +msgid "line" +msgstr "liña" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:186 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:31 +msgid "RECEIVED" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:32 + +msgid "PENDING" +msgstr "FIN" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:33 + +msgid "ORDERED" +msgstr "OFRECIDO" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:34 +msgid "PROCESSING" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:35 + +msgid "CANCELED" +msgstr "CANCELADO" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java:899 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:646 +msgid "Cannot spread two advances in the same order element" +msgstr "Non pode haber dous avances que propagan nun elemento de pedido" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:567 +msgid "" +"Some ancestor has the same label assigned, so this element is already " +"inheriting this label" +msgstr "" +"Algún antecesor ten a mesma etiqueta asignada, así que este elemento xa está " +"herdando esa etiqueta" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:670 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:697 +msgid "Duplicate Advance Assignment For Order Element" +msgstr "Asignación de avance duplicada no elemento de pedido" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:259 +msgid "workHours should be greater or equals to 0" +msgstr "As horas de traballo deben ser maiores o iguais a cero" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:271 +msgid "" +"\"workHours\" value is not valid, taking into account the current list of " +"HoursGroup" +msgstr "" +"O valor de horas de traballo non é válido, tendo en conta a lista actual de " +"grupos de horas" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:186 msgid "the resource type should be Worker or Machine" msgstr "o tipo de recurso debe ser Traballador ou Máquina" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:195 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:195 msgid "Working hours shouldn't be negative" msgstr "As horas de traballo non poden ser negativas" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:224 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:224 msgid "Total percentage should be less than 100%" msgstr "A porcentaxe total debe ser menor que 100%" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:273 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:273 #, java-format msgid "" " The criterion {0} can not be assigned to this hoursGroup because its " @@ -5917,7 +6364,7 @@ msgstr "" " O criterio {0} non se pode asignar a este grupo de horas porque o seu tipo " "de recurso é distinto." -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:279 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:279 #, java-format msgid "" " The criterion {0} can not be assigned to this hoursGroup because it " @@ -5926,155 +6373,280 @@ msgstr "" " O criterio {0} non se pode asignar a este grupo de horas porque xa existe " "no grupo." -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:168 -#, java-format -msgid "{0} is already child of another {1}" -msgstr "{0} xa é fillo doutro {1}" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 +msgid "OFFERED" +msgstr "OFRECIDO" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:214 -msgid "it's already somewhat scheduled" -msgstr "xa está planificado dalgún xeito" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 +msgid "ACCEPTED" +msgstr "ACEPTADO" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:228 -msgid "it can't be unscheduled" -msgstr "non se pode quitar a planificación" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 +msgid "STARTED" +msgstr "EMPEZADO" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:366 -msgid "Completely scheduled" -msgstr "Completamente planificado" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 +msgid "FINISHED" +msgstr "REMATADO" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:368 -msgid "Partially scheduled" -msgstr "Parcialmente planificado" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 +msgid "CANCELLED" +msgstr "CANCELADO" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:370 -msgid "Unscheduled" -msgstr "Non planificado" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 +msgid "SUBCONTRACTED PENDING ORDER" +msgstr "SUBCONTRATADO PENDENTE PEDIDO" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:376 -msgid "C" -msgstr "C" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 +msgid "STORED" +msgstr "ALMACENADO" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:378 -msgid "P" -msgstr "P" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:380 -msgid "U" -msgstr "N" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:568 -msgid "" -"Some ancestor has the same label assigned, so this element is already " -"inheriting this label" -msgstr "" -"Algún antecesor ten a mesma etiqueta asignada, así que este elemento xa está " -"herdando esa etiqueta" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:647 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java:881 -msgid "Cannot spread two advances in the same order element" -msgstr "Non pode haber dous avances que propagan nun elemento de pedido" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:671 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:698 -msgid "Duplicate Advance Assignment For Order Element" -msgstr "Asignación de avance duplicada no elemento de pedido" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java:536 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java:536 #, java-format msgid " The {0} already exist into other order element" msgstr " O {0} xa existe noutro elemento de pedido" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 -msgid "OFFERED" -msgstr "OFRECIDO" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:168 +#, java-format +msgid "{0} is already child of another {1}" +msgstr "{0} xa é fillo doutro {1}" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 -msgid "ACCEPTED" -msgstr "ACEPTADO" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:214 +msgid "it's already somewhat scheduled" +msgstr "xa está planificado dalgún xeito" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 -msgid "STARTED" -msgstr "EMPEZADO" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:228 +msgid "it can't be unscheduled" +msgstr "non se pode quitar a planificación" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 -msgid "FINISHED" -msgstr "REMATADO" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:366 +msgid "Completely scheduled" +msgstr "Completamente planificado" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 -msgid "CANCELLED" -msgstr "CANCELADO" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:368 +msgid "Partially scheduled" +msgstr "Parcialmente planificado" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 -msgid "SUBCONTRACTED PENDING ORDER" -msgstr "SUBCONTRATADO PENDENTE PEDIDO" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:370 +msgid "Unscheduled" +msgstr "Non planificado" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 -msgid "STORED" -msgstr "ALMACENADO" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:376 +msgid "C" +msgstr "C" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:259 -msgid "workHours should be greater or equals to 0" -msgstr "As horas de traballo deben ser maiores o iguais a cero" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:378 +msgid "P" +msgstr "P" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:271 -msgid "" -"\"workHours\" value is not valid, taking into account the current list of " -"HoursGroup" -msgstr "" -"O valor de horas de traballo non é válido, tendo en conta a lista actual de " -"grupos de horas" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:380 +msgid "U" +msgstr "N" -#: navalplanner-business/src/main/java/org/navalplanner/business/scenarios/entities/Scenario.java:175 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:32 +msgid "Read authorization" +msgstr "Autorización de lectura" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:33 +msgid "Write authorization" +msgstr "Autorización de escritura" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:33 +msgid "Web service reader" +msgstr "Lectura de servizos web" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:34 +msgid "Web service writer" +msgstr "Escritura de servizos web" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:35 +msgid "All orders read allowed" +msgstr "Permitida lectura de tódolos pedidos" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:36 +msgid "All orders edition allowed" +msgstr "Permitida edición de tódolos pedidos" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:37 +msgid "Order creation allowed" +msgstr "Permitida creación de pedidos" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/scenarios/entities/Scenario.java:175 #, java-format msgid "Derived from {0}" msgstr "Derivado de {0}" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:32 -msgid "Read authorization" -msgstr "Autorización de lectura" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/QueuePosition.java:52 +msgid "Hour should be a value between 0 and 23" +msgstr "A hora debe ser un valor entre 0 e 23" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:33 -msgid "Write authorization" -msgstr "Autorización de escritura" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueDependency.java:169 +msgid "A queue dependency has to have an origin different from destiny" +msgstr "A dependencia de cola debe ter unha orixe diferente do destino" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:33 -msgid "Web service reader" -msgstr "Lectura de servizos web" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:29 +msgid "Pending" +msgstr "Pendente" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:34 -msgid "Web service writer" -msgstr "Escritura de servizos web" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31 +msgid "Failed sent" +msgstr "Fallo no envío" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:35 -msgid "All orders read allowed" -msgstr "Permitida lectura de tódolos pedidos" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:32 +msgid "Success sent" +msgstr "Éxito no envío" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:36 -msgid "All orders edition allowed" -msgstr "Permitida edición de tódolos pedidos" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:27 +msgid "Finished" +msgstr "Rematado" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:37 -msgid "Order creation allowed" -msgstr "Permitida creación de pedidos" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:28 +msgid "In progress" +msgstr "En progreso" -msgid "Add measure" -msgstr "Engadir medida" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:30 +msgid "Blocked" +msgstr "Bloqueado" + +#~ msgid "Company Scheduling" +#~ msgstr "Planificación da compañía" + +#~ msgid "Scheduling progress per order" +#~ msgstr "Progreso da planificación por recurso" + +#~ msgid "Edit type of work hour" +#~ msgstr "Editar tipo de horas de traballo" + +#~ msgid "List quality forms" +#~ msgstr "Lista de formularios de calidade" + +#~ msgid "Orders List" +#~ msgstr "Lista de pedidos" + +#~ msgid "Edit virtual resource" +#~ msgstr "Editar recurso virtual" + +#~ msgid "Manage cost categories" +#~ msgstr "Administrar categorías de coste" + +#~ msgid "General resource allocation" +#~ msgstr "Asignación de recursos xeral" + +#~ msgid "Work report query" +#~ msgstr "Consulta de partes de traballo" + +#~ msgid "Create virtual resource" +#~ msgstr "Crear recurso virtual" + +#~ msgid "Label types" +#~ msgstr "Tipos de etiqueta" + +#~ msgid "Manage criteria" +#~ msgstr "Xestionar criterios" + +#~ msgid "Name name" +#~ msgstr "Nome nome" + +#~ msgid "Apply filtering to machines satisfying required criteria" +#~ msgstr "Aplicar filtrado ás máquinas que satisfán os criterios requeridos" + +#~ msgid "Edit worker" +#~ msgstr "Editar traballador" + +#~ msgid "Hours of day" +#~ msgstr "Horas do día" + +#~ msgid "Could not save new criterion" +#~ msgstr "Non se puido gardar o novo criterio" + +#~ msgid "Edit unit type data" +#~ msgstr "Editar datos do tipo de unidade" + +#~ msgid "Type of work hours listing" +#~ msgstr "Listado de tipos de horas de traballo" + +#~ msgid "List label types" +#~ msgstr "Listar tipos de etiqueta" + +#~ msgid "Unit types" +#~ msgstr "Tipos de unidades" + +#~ msgid "Criterion saved" +#~ msgstr "Criterio gardado" + +#~ msgid "NavalPlan: Scheduling progress report" +#~ msgstr "NavalPlan: Informe de avance de planificación" + +#~ msgid "Manage external companies" +#~ msgstr "Administrar empresas externas" + +#~ msgid "Overall Resources Load" +#~ msgstr "Carga global de recursos" + +#~ msgid "Work report types" +#~ msgstr "Tipos de partes de traballo" + +#~ msgid "Completed estimated hours" +#~ msgstr "Horas estimadas completadas" + +#~ msgid "Manage user accounts" +#~ msgstr "Administrar contas de usuario" + +#~ msgid "Manage scenarios" +#~ msgstr "Xestionar escenarios" + +#~ msgid "Edit external company" +#~ msgstr "Editar empresas externas" + +#~ msgid "Report advances" +#~ msgstr "Notificar avances" + +#~ msgid "Limiting resources" +#~ msgstr "Recursos limitantes" + +#~ msgid "NavalPlan: Work report admin query" +#~ msgstr "NavalPlan: Consulta de administración de partes de traballo" + +#~ msgid "Work report listing" +#~ msgstr "Listado de partes de traballo" + +#~ msgid "NavalPlan: Type of work hours" +#~ msgstr "NavalPlan: Tipos de horas de traballo" + +#~ msgid "External companies listing" +#~ msgstr "Listado de empresas externas" + +#~ msgid "Manage user profiles" +#~ msgstr "Administrar perfís de usuario" + +#~ msgid "NavalPlan: Work report types" +#~ msgstr "NavalPlan: Tipos de partes de traballo" + +#~ msgid "Hours for an exception day should be greater or equal than zero" +#~ msgstr "As horas para un día de excepción deben ser maiores o iguais a cero" + +#~ msgid "NavalPlan: External companies" +#~ msgstr "NavalPlan: Empresas externas" + +#~ msgid "NavalPlan: Timeline material report" +#~ msgstr "NavalPlan: Informe de materiais ao longo do tempo" + +#~ msgid "Workers list" +#~ msgstr "Lista de traballadores" + +#~ msgid "Manage types of work hours" +#~ msgstr "Administrar tipos de horas de traballo" + +#~ msgid "Machines list" +#~ msgstr "Lista de máquinas" + +#~ msgid "Manage advance types" +#~ msgstr "Xestionar tipos de avance" #~ msgid "should select a advance type" #~ msgstr "debe seleccionar un tipo de avance" -#~ msgid "Filter by criteria" -#~ msgstr "Filtrar por criterios" - -#~ msgid "Apply filtering to resource load satisfying required criteria" -#~ msgstr "" -#~ "Aplicar filtrado á carga de recursos que satisfai os criterios requeridos" - -#~ msgid "Filter by resources" -#~ msgstr "Filtrar por recursos" - #~ msgid "Auto queueing" #~ msgstr "Auto encolar" @@ -6191,7 +6763,7 @@ msgstr "Engadir medida" #~ msgid "subcontractor" #~ msgstr "subcontratista" -#, fuzzy + #~ msgid "Apply filtering to order elements satisfying required critera" #~ msgstr "" #~ "Aplicar filtrado aos elementos de pedido que satisfán os criterios " @@ -6203,9 +6775,6 @@ msgstr "Engadir medida" #~ msgid "code is used by another machine being imported" #~ msgstr "código usado por outra máquina que está sendo importada" -#~ msgid "Filter by label:" -#~ msgstr "Filtrar por etiqueta:" - #~ msgid "criterion type name is used by another criterion type being imported" #~ msgstr "" #~ "o nome de tipo de criterio está sendo usado por outro tipo de criterio " @@ -6228,26 +6797,26 @@ msgstr "Engadir medida" #~ msgid "Starting date:" #~ msgstr "Data de inicio:" -#, fuzzy + #~ msgid "Status:" #~ msgstr "Estado:" -#, fuzzy + #~ msgid "Ending date:" #~ msgstr "Data de fin" -#, fuzzy + #~ msgid " Total :" #~ msgstr "Total" #~ msgid "Advance type:" #~ msgstr "Tipo de avance:" -#, fuzzy + #~ msgid "Historical list Assignment" #~ msgstr "Dividir asignación" -#, fuzzy + #~ msgid "Historical assignment" #~ msgstr "Dividir asignación" diff --git a/navalplanner-webapp/src/main/resources/i18n/keys.pot b/navalplanner-webapp/src/main/resources/i18n/keys.pot index 44e2559a9..1c278ec3d 100644 --- a/navalplanner-webapp/src/main/resources/i18n/keys.pot +++ b/navalplanner-webapp/src/main/resources/i18n/keys.pot @@ -3,12 +3,11 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-23 11:47+0200\n" +"POT-Creation-Date: 2010-09-07 11:57+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,96 +15,119 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:336 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:106 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:116 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:140 +msgid "This order has already been added." +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:343 msgid "The resource cannot be null" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:386 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:403 msgid "criterion codes must be unique inside a criterion type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:93 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:95 msgid "No authorizations were added because you did not select any." msgstr "" -#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:63 -#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:73 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 +msgid "Order Name" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:69 +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:79 msgid "en" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:130 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:129 msgid "Create exception" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:356 +msgid "Up to company view" +msgstr "" + #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:45 msgid "Select report data" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:351 -msgid "Up to company view" +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:206 +msgid "there exist multiple resource calendars with name {0}" msgstr "" #: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:58 msgid "Create Virtual Worker" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:205 -msgid "there exist multiple resource calendars with name {0}" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:765 #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:97 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:124 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:148 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:782 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:136 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:69 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:138 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:27 #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:25 #: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:23 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:27 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30 -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:21 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:17 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:25 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:45 #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:37 -#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:28 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:65 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:91 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:75 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:27 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:69 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:136 -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:38 -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:37 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:123 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:165 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:210 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:33 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:100 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:51 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:130 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:38 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:39 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:112 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:153 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:122 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:127 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:101 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:142 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:101 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:97 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:139 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:180 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:128 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:152 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 +#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:28 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:61 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:87 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:36 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:48 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:66 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:36 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:55 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49 #: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:55 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:51 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:112 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:39 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:80 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:124 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:166 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:211 -#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:27 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:75 msgid "Operations" msgstr "" @@ -113,20 +135,22 @@ msgstr "" msgid "New order sequence" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:7 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:9 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:27 msgid "Add criterion" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:130 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:498 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:130 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:194 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:149 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:536 msgid "There is no type of work hours with this code" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:123 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:92 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:81 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:103 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:100 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:135 msgid "Select" msgstr "" @@ -134,24 +158,20 @@ msgstr "" msgid "there must be {0} hours instead of {1}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:225 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:36 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:1 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:62 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:251 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:1 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:52 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:137 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:49 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:21 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:64 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:33 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:33 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:88 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:49 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:52 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:137 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:21 msgid "Materials" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:21 -msgid "NavalPlan: Virtual workers" -msgstr "" - #: navalplanner-webapp/src/main/webapp/common/configuration.zul:108 msgid "Order view" msgstr "" @@ -168,7 +188,7 @@ msgstr "" msgid "Percentage of consumed budget hours / hours consumed" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:78 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:78 msgid "login name not specified" msgstr "" @@ -180,25 +200,26 @@ msgstr "" msgid "Please, select a calendar" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:165 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:161 +msgid "Predefined" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:164 msgid "Summary" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:63 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:252 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:65 msgid "Quality Forms" msgstr "" -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28 -#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:161 -msgid "Predefined" -msgstr "" - #: navalplanner-webapp/src/main/webapp/common/configuration.zul:122 msgid "Order sequences" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:237 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:263 msgid "Reports" msgstr "" @@ -206,7 +227,7 @@ msgstr "" msgid "Criterion requirements" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:90 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:92 msgid "START_NOT_EARLIER_THAN" msgstr "" @@ -220,15 +241,21 @@ msgstr "" msgid "Dedication chart" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:630 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:667 msgid "Not the same hours group, impossible to update" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:349 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:225 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:140 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:154 +msgid "Resource Usage" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:437 msgid "Remove limiting resource element" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:20 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:40 msgid "Active period from" msgstr "" @@ -236,11 +263,11 @@ msgstr "" msgid "hours type :" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:461 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:494 msgid "Unassign" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:622 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:648 msgid "incorrect initialization of the advance assignment controller." msgstr "" @@ -248,6 +275,10 @@ msgstr "" msgid "Manual assignment" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:235 +msgid "Companies" +msgstr "" + #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:67 msgid "Quality form items list" msgstr "" @@ -256,12 +287,12 @@ msgstr "" msgid "Name/Code" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:850 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:890 msgid "Create order" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:196 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:228 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:247 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:215 msgid "" "End date is not valid, the new end date must be later the current end date" msgstr "" @@ -270,17 +301,17 @@ msgstr "" msgid "Select print visualization options" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:742 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:758 msgid "Hour start" msgstr "" +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:117 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:31 #: navalplanner-webapp/src/main/webapp/planner/main.zul:52 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:97 msgid "Start" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:118 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:118 msgid "cost assignment's category not specified" msgstr "" @@ -304,11 +335,16 @@ msgstr "" msgid "Filter quality forms by :" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:97 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:98 msgid "changing perspective" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:121 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:242 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:31 +msgid "Transfer Projects Between Scenarios" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:123 msgid "" "Could not add those authorizations to profile {0} because they were already " "present." @@ -326,13 +362,13 @@ msgstr "" msgid "NavalPlan: Error" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:244 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:41 -msgid "Materials needs at date" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:238 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:33 +msgid "Advance Report" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:299 #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:566 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:299 msgid "Indent" msgstr "" @@ -348,28 +384,27 @@ msgstr "" msgid "Create Order Element" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31 -msgid "Locations" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java:90 msgid "The advanceType cannot be modified" msgstr "" +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31 +msgid "Locations" +msgstr "" + #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:70 msgid "New quality form item" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:201 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:20 -msgid "Templates list" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:49 +msgid "generic allocation" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:143 msgid "For interpolation at least two stretches are needed" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:718 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:727 msgid "Order Code" msgstr "" @@ -377,7 +412,7 @@ msgstr "" msgid "Login name" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:14 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:34 msgid "Current" msgstr "" @@ -385,43 +420,47 @@ msgstr "" msgid "Machine deleted" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:76 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:70 msgid "Dependencies" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:196 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:185 msgid "missing code in a calendar exception" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1099 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1100 msgid "" "there exist criterion satisfactions referring to criterion types not " "applicable to this resource" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:61 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:49 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:63 #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:49 msgid "Criterion Requirement" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:54 -msgid "Company Scheduling" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:60 +msgid "Minutes" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:131 msgid "You can not remove a scenario with derived scenarios" msgstr "" +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:21 +msgid "Work Report Types" +msgstr "" + #: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:22 msgid "Create new version" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:221 msgid "Derived" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:285 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:297 msgid "a disabled resource has enabled subresources" msgstr "" @@ -434,18 +473,18 @@ msgstr "" msgid "Client" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:499 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:110 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:109 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:502 msgid "" "there are no resources for required criteria: {0}. So the generic allocation " "can't be added" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:393 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:428 msgid "work report has not any description value with this field name" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java:146 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java:146 msgid "material category name has to be unique. It is already used" msgstr "" @@ -457,8 +496,13 @@ msgstr "" msgid "It is not allowed to consolidate advances." msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:269 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:41 +msgid "Project Costs Per Resource" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:413 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:140 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:412 msgid "Confirm deleting this hour cost. Are you sure?" msgstr "" @@ -466,8 +510,8 @@ msgstr "" msgid "Delete Milestone" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:486 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:737 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:763 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:485 msgid "The order has no scheduled elements" msgstr "" @@ -489,47 +533,50 @@ msgstr "" msgid "Configure" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:242 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 -msgid "Scheduling progress per order" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:21 -msgid "Unit type list" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:56 #: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:56 msgid "First name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:228 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:236 msgid "Could not execute print command" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:108 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:112 msgid "Complementary text fields" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:190 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1161 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:113 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:194 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1173 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:132 #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:282 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:179 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:198 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:691 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:717 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:179 msgid "Confirm deleting {0}. Are you sure?" msgstr "" +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:36 +msgid "Work Reports List" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:248 +msgid "Accounts" +msgstr "" + #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:81 msgid "External code" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:46 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:96 +msgid "Limiting" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:48 msgid "View" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:521 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:524 msgid "resources per day must be not empty and bigger than zero" msgstr "" @@ -538,15 +585,15 @@ msgstr "" msgid "Version" msgstr "" +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:46 +msgid "Apply filtering to resources satisfying required criteria" +msgstr "" + #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:98 msgid "Up" msgstr "" -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:23 -msgid "Edit type of work hour" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:164 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:183 msgid "" "CriterionType is not valid, it overlaps other criterionSatisfaction with the " "same criterionType" @@ -556,14 +603,10 @@ msgstr "" msgid "Types of work hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:58 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:126 msgid "EAC" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:21 -msgid "Virtual workers list" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:143 msgid "" "Its planning is not in the current scene.\n" @@ -583,33 +626,37 @@ msgstr "" msgid "Total hours order element" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:16 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 +#: navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul:22 +msgid "NavalPlan: Cost Categories" +msgstr "" + #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:68 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:62 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:39 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:59 msgid "End date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:227 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:254 msgid "missing worker code in the work report" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/advances/AdvanceAssignmentPlanningCommand.java:68 -msgid "Advance assignment" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:140 msgid "" "Value is not valid, the default max value must be greater than the precision " "value " msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/advances/AdvanceAssignmentPlanningCommand.java:68 +msgid "Advance assignment" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:507 msgid "Reassigning {0} orders" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:87 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:87 msgid "profile name is already being used by another profile" msgstr "" @@ -617,62 +664,67 @@ msgstr "" msgid "E-mail" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:103 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:109 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:99 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:115 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:111 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:121 msgid "Please, select an order" msgstr "" -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:21 -msgid "List quality forms" -msgstr "" - #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:26 msgid "User data" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:127 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:135 msgid "Resource / Criteria" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:767 -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:41 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:48 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:15 -msgid "Criteria" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:46 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:134 msgid "Order Details" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:79 -msgid "AS_SOON_AS_POSSIBLE" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:256 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:827 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:51 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:45 +msgid "Criteria" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:99 msgid "Error setting up creation form." msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:81 +msgid "AS_SOON_AS_POSSIBLE" +msgstr "" + #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:43 msgid "Lines" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:44 -msgid "Orders List" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:190 +msgid "Error on showing warning message removing workReportType: " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:189 -msgid "Error on showing warning message removing workReportType: " +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:601 +msgid "Edit Work Report" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:21 +msgid "Quality Forms List" msgstr "" #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:29 msgid "Personal data" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:210 -msgid "Work reports" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:161 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:157 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:183 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:298 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:230 +msgid "please, select a Criterion" msgstr "" #: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:41 @@ -687,15 +739,11 @@ msgstr "" msgid "Modified" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:38 -msgid "Edit virtual resource" -msgstr "" - #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:215 msgid "Add Criterion" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:212 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:210 msgid "Fattened Tree {0}" msgstr "" @@ -703,49 +751,50 @@ msgstr "" msgid "You can not remove the current scenario" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:287 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:69 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:88 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:288 msgid "MessagesContainer is needed" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:43 #: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:68 -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:19 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:39 #: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:23 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60 msgid "Ending date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:227 -msgid "Manage cost categories" +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:20 +msgid "Templates List" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:33 +msgid "Subcontracted Tasks List" msgstr "" #: navalplanner-webapp/src/main/webapp/common/configuration.zul:135 msgid "Last value" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:198 -msgid "General resource allocation" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:65 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:67 msgid "Statistics log" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:46 #: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:39 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:46 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:43 msgid "Edit Calendar" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:215 -msgid "Work report query" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:271 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:41 +msgid "Materials Needs At Date" msgstr "" #: navalplanner-webapp/src/main/webapp/common/configuration.zul:54 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:14 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:20 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:40 msgid "Cannot be empty or null" msgstr "" @@ -757,11 +806,15 @@ msgstr "" msgid "Total Budget" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:50 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:50 msgid "Hierarchy" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:740 +#: navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:22 +msgid "NavalPlan: Work Hours" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:748 msgid "" "This worker cannot be deleted because it has assignments to projects or " "imputed hours" @@ -780,39 +833,42 @@ msgstr "" msgid "Time period saved" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:39 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:167 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:163 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:189 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:304 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:236 +msgid "This Criterion has already been added." +msgstr "" + +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:40 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:34 msgid "Filter work report by :" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:103 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:41 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:231 msgid "Workers" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:49 -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 msgid "Order element code" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:109 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:323 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:109 msgid "Advance measurements: " msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:22 -msgid "NavalPlan: Work report" -msgstr "" - #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:54 msgid "Year" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:66 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:66 msgid "profile name not specified" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:60 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:61 msgid "Date Start" msgstr "" @@ -824,10 +880,10 @@ msgstr "" msgid "From Chosen" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/order.zul:132 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:63 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:34 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:55 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:63 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:92 msgid "Value" msgstr "" @@ -835,24 +891,32 @@ msgstr "" msgid "Hour costs" msgstr "" +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:40 +msgid "Edit Scenario" +msgstr "" + #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:76 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:52 msgid "Add role" msgstr "" -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:40 -msgid "Edit Scenario" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:489 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:922 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:504 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:926 msgid "Exception end date should be greater or equals than start date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:703 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:742 msgid "Duplicate advance assignment for order element " msgstr "" +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:130 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:146 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:119 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:157 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:117 +msgid "Filter by criterions" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:402 msgid "" "The {0} can not be assigned to this resource. Its interval overlaps with " @@ -863,11 +927,11 @@ msgstr "" msgid "Work done until ending date:" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:63 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:131 msgid "Schedule Performance Index" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:128 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136 msgid "Earlier starting date" msgstr "" @@ -875,40 +939,44 @@ msgstr "" msgid "Type data" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:502 -msgid "Create virtual resource" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:249 +msgid "Profiles" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:224 -msgid "Label types" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:349 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:356 msgid "The order element code cannot be null" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:746 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:762 msgid "Hour finish" msgstr "" +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:39 +msgid "Edit Work Report Type" +msgstr "" + #: navalplanner-webapp/src/main/webapp/common/layout/template.zul:103 msgid "Perspectives" msgstr "" +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:67 +msgid "Workable time" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:239 msgid "missing code in a subcategory" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:426 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:427 msgid "Confirm deleting this cost category. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:30 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:73 +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:64 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:34 msgid "Non limiting resource allocation" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:189 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:191 msgid "Error removing element: " msgstr "" @@ -916,8 +984,8 @@ msgstr "" msgid "Company name" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:32 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:74 +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:65 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:36 msgid "Limiting resource allocation" msgstr "" @@ -929,13 +997,13 @@ msgstr "" msgid "Split new assignment" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:164 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:210 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:163 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:209 msgid "Expiry date" msgstr "" +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:66 #: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:52 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:58 msgid "Pagination" msgstr "" @@ -943,19 +1011,28 @@ msgstr "" msgid "Change scenario" msgstr "" -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:42 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:38 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:41 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:71 msgid "Categories" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:110 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:125 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:143 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:114 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:146 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:120 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:110 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:181 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:128 +msgid "Project Details" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:35 +msgid "Create Criterion Type" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:196 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:225 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182 msgid " to go to output directly" msgstr "" @@ -963,23 +1040,19 @@ msgstr "" msgid "Add new hours group" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:210 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:214 msgid "Criteria: {0} " msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:364 -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:62 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:133 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:64 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:93 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:79 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:62 msgid "Percentage" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:222 -msgid "Manage criteria" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:134 msgid "Updated" msgstr "" @@ -997,66 +1070,78 @@ msgstr "" msgid "Total capability" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:232 -msgid "Problems connecting with client web service" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:834 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:877 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:508 +msgid "Advance" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:502 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:834 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:774 -msgid "Advance" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:232 +msgid "Problems connecting with client web service" msgstr "" #: navalplanner-webapp/src/main/webapp/common/layout/login.zul:20 msgid "NavalPlan: User access" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:93 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:122 -msgid "Exception Type" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:21 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:21 -msgid "NavalPlan: Subcontracted tasks" -msgstr "" - #: navalplanner-webapp/src/main/webapp/materials/materials.zul:21 msgid "NavalPlan: Materials" msgstr "" +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:93 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:121 +msgid "Exception Type" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:202 msgid "Advances sent successfully" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:215 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:512 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:846 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:754 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:60 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:47 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:45 -msgid "Labels" +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:21 +msgid "Profiles List" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:243 msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:257 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:216 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:814 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:889 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:518 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:62 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:45 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:67 +msgid "Labels" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1229 msgid "Calculated advances measurement can not be removed" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:254 +msgid "Data Types" +msgstr "" + #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:147 msgid "Total hours" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:66 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:74 +msgid "Create Work Hours Type" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:59 msgid "Filter by task status" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:360 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:21 +msgid "NavalPlan: Advance Report" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:406 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:518 msgid "Select date:" msgstr "" @@ -1069,8 +1154,8 @@ msgstr "" msgid "Value last advance reported" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:482 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:915 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:497 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:919 msgid "You should select a end date for the exception" msgstr "" @@ -1086,53 +1171,57 @@ msgstr "" msgid "Unknown attribute '{0}' in class {1}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:649 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:650 msgid "NON LIMITING RESOURCE" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java:96 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java:96 msgid "machine name not specified" msgstr "" +#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:21 +msgid "NavalPlan: Workers" +msgstr "" + #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:77 msgid "Activation periods" msgstr "" -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:23 -msgid "Edit cost category" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:368 msgid "Passed" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:174 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:87 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:127 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:174 msgid "already assigned" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:33 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:33 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:123 msgid "Calendar" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:84 +msgid "{0}h" +msgstr "" + #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:30 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:55 msgid "Read" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:205 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:230 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:81 msgid "Resources" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:154 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:152 msgid "Source and destination scenarios should be different" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:243 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:241 msgid "CriterionType and its criteria saved" msgstr "" @@ -1140,21 +1229,25 @@ msgstr "" msgid "scenario" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:42 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:187 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:50 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:49 -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:22 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:9 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:8 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:188 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:28 msgid "to" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:43 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:86 +msgid " {0}m" +msgstr "" + #: navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul:43 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:43 msgid "<<" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:106 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:105 msgid "worker's first name not specified" msgstr "" @@ -1162,14 +1255,15 @@ msgstr "" msgid "date not specified" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:93 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:94 msgid "Select type :" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:59 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:255 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:48 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:45 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:61 #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:43 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:45 msgid "Advances" msgstr "" @@ -1177,11 +1271,21 @@ msgstr "" msgid "Shrink to fit page width" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:224 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:261 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:271 +msgid "Projects Planning" +msgstr "" + #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:66 msgid "Last name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:252 +#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:21 +msgid "NavalPlan: Virtual Workers Groups" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:253 msgid "cost category name not specified" msgstr "" @@ -1190,42 +1294,26 @@ msgstr "" msgid "Remove" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:21 -msgid "NavalPlan: Templates" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:62 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130 msgid "SPI" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:47 -msgid "Name name" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul:22 -msgid "NavalPlan: Cost categories" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:163 -msgid "Edit quality form" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1343 msgid "Interpolation" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:310 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:313 msgid "{0} must not be before {1}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:220 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:205 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:224 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:239 msgid "" "Start date is not valid, the new start date must be previous the current " "start date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:377 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:376 msgid "the code must be not null or not empty" msgstr "" @@ -1233,67 +1321,57 @@ msgstr "" msgid "Stretches list" msgstr "" -#: navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:21 -msgid "NavalPlan: QualityForms" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:51 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:59 msgid "Zoom" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:506 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:210 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:36 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:40 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:169 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:84 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:146 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:84 #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:47 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:36 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:36 #: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:38 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:91 #: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:40 #: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:39 #: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:91 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100 -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:39 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:123 -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:37 -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:40 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:104 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:146 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:126 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:45 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:40 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:44 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:128 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:36 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:40 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:211 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:169 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:38 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:116 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:135 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:80 #: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:37 #: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:41 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:124 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:40 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:44 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:135 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:80 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:37 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:40 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:104 msgid "Save" msgstr "" -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:21 -msgid "NavalPlan: AdvanceTypes" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:795 +msgid "Sorry, you do not have permissions to access this order" msgstr "" #: navalplanner-webapp/src/main/webapp/common/configuration.zul:87 msgid "Material categories" msgstr "" -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39 -msgid "Edit advance type data" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:131 msgid "Pending update" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:59 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:67 msgid "End date:" msgstr "" @@ -1308,24 +1386,15 @@ msgid "" "advances." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:296 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:303 msgid "Order Element code cannot be null" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:243 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41 -msgid "Task scheduling status for an order" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:62 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:50 msgid "Users authorization" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:334 -msgid "Assign element to queue manually" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:171 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:172 msgid "Problems connecting with subcontractor web service" msgstr "" @@ -1333,20 +1402,19 @@ msgstr "" msgid "Assigned load" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:68 -msgid "Filter by workers" -msgstr "" - #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:106 msgid "End Date" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:76 +msgid "Filter by workers" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:111 msgid "Resources Per Day" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:201 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:167 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:201 msgid "ResourceType must be not-null" msgstr "" @@ -1364,7 +1432,7 @@ msgstr "" msgid "Move down" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:501 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:507 msgid "Name: {0}" msgstr "" @@ -1372,44 +1440,40 @@ msgstr "" msgid "Report structure" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:87 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:87 msgid "password not specified" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:49 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:56 msgid "Yes" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:116 #: navalplanner-webapp/src/main/webapp/templates/templates.zul:57 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:117 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:39 msgid "General data" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:57 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 msgid "BAC" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:26 -msgid "Apply filtering to machines satisfying required criteria" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:379 -msgid "Calculate Number of Hours" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1301 msgid "" "This advance measurement can not be in current date, because it is " "consolidated. it is necessary to select other date." msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:384 +msgid "Calculate Number of Hours" +msgstr "" + #: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:37 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:179 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:80 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:34 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:139 msgid "Assign" msgstr "" @@ -1417,57 +1481,67 @@ msgstr "" msgid "missing code in a criterion" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:657 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1057 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:717 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1087 #: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:39 msgid "Create Template" msgstr "" +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:22 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:22 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:22 +msgid "NavalPlan: Work Reports" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:168 msgid "Advance type saved" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:601 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:101 +msgid "Edit Company" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:89 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:78 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:116 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:78 +msgid "Filter by labels" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:621 msgid "" "IMPORTANT: Don't forget to communicate to subcontractor that his contract " "has been cancelled" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:57 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:21 +msgid "NavalPlan: Hours Worked Per Resource" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 msgid "Schedule Variance" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:414 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:409 msgid "Service does not manage resource of type: {0}" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:39 -msgid "Edit worker" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:187 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:188 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:553 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:591 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:622 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1258 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:533 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:571 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:602 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:57 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:57 msgid "Warning" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:34 #: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:34 msgid "Select parent calendar" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:67 -msgid "Hours of day" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21 -msgid "NavalPlan: Task scheduling status report" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:297 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:297 msgid "criterion satisfaction with end date less than start date" msgstr "" @@ -1487,13 +1561,14 @@ msgstr "" msgid "Assignment Type" msgstr "" -#: navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/resources_use.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/index.zul:21 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:21 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:21 +#: navalplanner-webapp/src/main/webapp/planner/resources_use.zul:21 #: navalplanner-webapp/src/main/webapp/planner/order.zul:21 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:21 +#: navalplanner-webapp/src/main/webapp/planner/index.zul:21 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:21 +#: navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul:21 msgid "NavalPlan: Scheduling" msgstr "" @@ -1506,26 +1581,30 @@ msgstr "" msgid "Error on splitting" msgstr "" -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:20 -msgid "NavalPlan: Unit types" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:45 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:65 msgid "Node without children" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:134 -msgid "Profile saved" +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:117 +msgid "There is no label with this code " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:201 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:205 msgid "Task: {0} " msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/order.zul:72 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:136 +msgid "Profile saved" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:63 msgid "Task properties" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:74 +msgid "There is no type of work report with this code" +msgstr "" + #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:27 #: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:33 msgid "Surname" @@ -1535,35 +1614,31 @@ msgstr "" msgid "You need to select some function to configure" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:694 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:372 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:155 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:67 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:115 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:48 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:134 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:8 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:44 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:65 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:73 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 -msgid "Date" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:362 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:361 msgid "the name must be not null or not empty" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:21 -msgid "NavalPlan: Resources" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:703 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:372 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:156 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:67 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:115 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:65 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:73 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:28 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:94 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:48 +msgid "Date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:532 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:570 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:552 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:590 msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "" @@ -1577,13 +1652,13 @@ msgstr "" msgid "Advance assignments" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:336 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:339 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:358 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:355 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:319 msgid "The criterion and its type cannot be null" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:211 msgid "The code is not valid. There is another unit type with the same code" msgstr "" @@ -1591,14 +1666,10 @@ msgstr "" msgid "( max: {0} )" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:204 msgid "Error on removing element: " msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:33 -msgid "Select queue" -msgstr "" - #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:63 msgid "Cannot calculate charts for current data" msgstr "" @@ -1607,21 +1678,25 @@ msgstr "" msgid "Found workers" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:464 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:53 +msgid "Select queue" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:465 msgid "The cost category had already been removed." msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:27 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:47 msgid "Work description" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:524 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:556 msgid "Order element {0} : Order is incompatible type with {1}" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:38 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:43 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:64 msgid "Split assignment" msgstr "" @@ -1633,32 +1708,29 @@ msgstr "" msgid "Down" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:109 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:124 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:142 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:113 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:145 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:119 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:109 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:195 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:165 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:209 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:184 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:162 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:224 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181 msgid "direct link" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:928 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:37 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:36 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:931 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:75 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:47 msgid "Label" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:241 -msgid "Order costs per resource" -msgstr "" - #: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:36 msgid "Create Scenario" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:605 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:665 msgid "Value is not valid, taking into account the current list of HoursGroup" msgstr "" @@ -1667,11 +1739,10 @@ msgstr "" msgid "Association with roles" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:351 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:384 msgid "missing type of work hours in a work report line" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:230 #: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:29 msgid "Quality forms" msgstr "" @@ -1681,57 +1752,58 @@ msgid "Hours group" msgstr "" #: navalplanner-webapp/src/main/webapp/templates/_list.zul:29 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:92 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:94 msgid "Days from Beginning to Deadline" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:59 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:127 msgid "Estimate At Completion" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:196 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:329 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:197 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:353 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:329 msgid "Delete item. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:219 -msgid "Edit machine" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:27 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:46 msgid "Indirect" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:101 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:101 msgid "cost assignment's start date not specified" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:48 -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:34 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java:46 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:42 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:34 msgid "Order code" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:95 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:108 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:99 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:105 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:95 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:181 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:197 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:170 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:208 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:167 msgid "Output format:" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:25 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:44 msgid "Direct" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:780 +msgid "Op." +msgstr "" + #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:55 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55 msgid "Reference date:" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:407 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:420 msgid "Limiting resource assignation" msgstr "" @@ -1743,25 +1815,20 @@ msgstr "" msgid "You will lose the changes. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:162 -msgid "Unit type name cannot be empty" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:199 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:21 msgid "Orders list" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:208 -msgid "Virtual worker groups" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:183 +msgid "Unit type name cannot be empty" msgstr "" #: navalplanner-webapp/src/main/webapp/templates/_list.zul:27 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:87 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:89 msgid "Delay from beginning (days)" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:289 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:296 msgid "Resource cannot be null" msgstr "" @@ -1769,11 +1836,12 @@ msgstr "" msgid "Do you want to delete " msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:511 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:34 msgid "Total Hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:71 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:127 msgid "All orders" msgstr "" @@ -1785,19 +1853,24 @@ msgstr "" msgid "Label list" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1169 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:290 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:267 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 +msgid "Work And Progress Per Task" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:421 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:435 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:147 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:420 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:434 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1181 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:290 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:261 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:206 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:699 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:185 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:725 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:187 msgid "Error on showing removing element: " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:85 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:87 msgid "start not earlier than" msgstr "" @@ -1807,10 +1880,18 @@ msgstr "" msgid "Select scenario" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:205 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:137 +msgid "Create Label Type" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:232 msgid "missing work report code in a work report" msgstr "" +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:35 +msgid "Create Work Report Type" +msgstr "" + #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 msgid "Criterion requirement" msgstr "" @@ -1825,7 +1906,6 @@ msgstr "" msgid "PDF" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75 #: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:45 #: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:47 #: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:69 @@ -1836,37 +1916,33 @@ msgstr "" msgid "Type resource assignation" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:318 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:148 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:297 msgid "Scheduling saved" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:196 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:155 -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:6 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:57 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:26 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:197 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:155 msgid "Add new row" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:468 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:501 msgid "Move" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:222 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:223 msgid "missing code in the resource calendar" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:138 -msgid "Could not save new criterion" -msgstr "" - #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:33 #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:33 msgid "Overload" msgstr "" +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:66 #: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:29 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:64 msgid "Assignment log" msgstr "" @@ -1882,11 +1958,7 @@ msgstr "" msgid "Deadline (days since beggining project)" msgstr "" -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:38 -msgid "Edit unit type data" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:390 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:397 msgid "number of hours is not properly calculated based on clock" msgstr "" @@ -1894,11 +1966,11 @@ msgstr "" msgid "Value is not valid, the type must be not empty" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:411 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:428 msgid "criterion type name is already being used" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:436 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:453 msgid "Could not get order code, please try again later" msgstr "" @@ -1906,61 +1978,64 @@ msgstr "" msgid "worker" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:102 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:134 +msgid "Edit Cost Category" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:100 msgid "Error setting up creation form for Criterion Type" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:6 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44 -msgid "External company" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:64 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30 #: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:26 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:65 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:43 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:82 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:112 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:26 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:58 #: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:27 msgid "Actions" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:145 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java:72 -msgid "New order element" +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:26 +msgid "External company" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:75 -msgid "Exceptions" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:149 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java:72 +msgid "New order element" msgstr "" #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:71 msgid "Start hour" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:847 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:75 +msgid "Exceptions" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:907 msgid "" "You can not remove the order element \"{0}\" because of this or any of its " "children are already in use in some work reports" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:201 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:225 msgid "format filters are not valid" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:496 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:528 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:746 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:781 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:548 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:772 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:495 msgid "You don't have read access to this order" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:305 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:178 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:304 msgid "The init date cannot be empty" msgstr "" @@ -1972,19 +2047,19 @@ msgstr "" msgid "Our company password" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:194 -msgid "Create machine" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:133 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:129 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:155 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:274 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:202 +msgid "This label has already been added." msgstr "" #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:46 msgid "A2" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:21 -msgid "Criterion type list" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:381 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:380 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_'." @@ -1998,7 +2073,7 @@ msgstr "" msgid "Hours Group" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:909 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:912 msgid "Unallocated name" msgstr "" @@ -2006,22 +2081,24 @@ msgstr "" msgid "Move up" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/order.zul:113 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:120 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:73 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:80 msgid "Advance Consolidation" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:55 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:123 msgid "BCWP" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:42 msgid "Subcontract communication date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:196 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:259 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:120 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:286 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:268 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:109 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:121 msgid "Scheduling" msgstr "" @@ -2033,12 +2110,7 @@ msgstr "" msgid "Nif" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:204 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:31 -msgid "Transfer orders between scenarios" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:58 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:126 msgid "Budget At Completion" msgstr "" @@ -2046,18 +2118,10 @@ msgstr "" msgid "Assign Label" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:63 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:71 msgid "Page up" msgstr "" -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:21 -msgid "Type of work hours listing" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:21 -msgid "List label types" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:511 msgid "{0} orders reassignation remaining" msgstr "" @@ -2066,13 +2130,14 @@ msgstr "" msgid "Work done from starting date:" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:509 -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:20 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:24 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:515 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50 #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:151 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:40 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:151 msgid "State" msgstr "" @@ -2088,16 +2153,20 @@ msgstr "" msgid "Single image" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:201 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:102 +msgid "Edit Profile" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:190 msgid "missing date in a calendar exception" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:445 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:460 msgid "Exception" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:226 -msgid "Unit types" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:270 +msgid "Create new order from template" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:191 @@ -2117,16 +2186,16 @@ msgstr "" msgid "Type name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:155 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:185 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:408 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:181 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:208 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:30 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:13 -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:26 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:407 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:33 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:26 msgid "All" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:333 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:421 msgid "Manual" msgstr "" @@ -2134,39 +2203,38 @@ msgstr "" msgid "Calendars List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:183 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:209 msgid "Cannot be higher than Ending date" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:214 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:213 msgid "Create activation period" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:10 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:30 msgid "Personal details" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:206 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:21 msgid "Workers List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:202 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:168 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:202 msgid "Criterion must be not-null" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:292 -msgid "Worker" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:399 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:487 msgid "" "Cannot allocate selected element. There is not any queue that matches " "resource allocation criteria at any interval of time" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:254 +msgid "Worker" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:160 -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:206 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:214 msgid "criterion name not specified" msgstr "" @@ -2182,7 +2250,7 @@ msgstr "" msgid "Advance Progress" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:4 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:24 msgid "Manual allocation" msgstr "" @@ -2191,11 +2259,15 @@ msgid "External overload" msgstr "" #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:32 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:69 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:57 msgid "Authorize" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:170 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:240 +msgid "Scenarios" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:177 msgid "Create order from Template" msgstr "" @@ -2207,18 +2279,18 @@ msgstr "" msgid "Quarter" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:699 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:738 msgid "Duplicate value true report global Advance for order element " msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:40 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:77 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:25 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:41 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:65 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:111 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:25 msgid "Profile name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:224 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:232 msgid "Could open generated PDF" msgstr "" @@ -2226,10 +2298,15 @@ msgstr "" msgid "Disable Delete" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:145 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:143 msgid "You should select a source scenario" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:268 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 +msgid "Estimated/Planned Hours Per Task" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:67 msgid "Assigned" msgstr "" @@ -2243,40 +2320,46 @@ msgid "" "The name is not valid, there is another advance type with the same name. " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:135 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:137 msgid "Company saved" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:234 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:173 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:174 msgid "Error: {0}" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:162 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:161 msgid "Parent" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:68 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:88 msgid "Earliest date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:213 -msgid "Work report list" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:116 +msgid "Type of work hours saved" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:114 -msgid "Type of work hours saved" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:226 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:111 +msgid "Projects" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:148 +msgid "Create Quality Form" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java:63 msgid "Not found converter for {0}" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:69 msgid "Material assignments" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:96 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:98 msgid "start in fixed date" msgstr "" @@ -2286,27 +2369,23 @@ msgid "" "value." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:916 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:919 msgid "Text field" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:194 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:193 msgid "Create new work week" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:137 -msgid "Create label type" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:648 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:649 msgid "LIMITING RESOURCE" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:82 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:86 msgid "Extended view" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:168 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:189 msgid "" "The meausure name is not valid. There is another unit type with the same " "measure name" @@ -2316,16 +2395,12 @@ msgstr "" msgid "Work record" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:129 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:151 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:149 msgid "Output format" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:174 -msgid "Criterion saved" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:115 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:113 msgid "Error setting up edition form." msgstr "" @@ -2337,25 +2412,20 @@ msgstr "" msgid "NavalPlan: Calendars" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:59 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:67 msgid "Page down" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:380 -msgid "Hours cannot be null" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:167 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:113 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:167 msgid "{0} not found type for criterion " msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:452 -msgid "resource type does not allow enabled criteria" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:387 +msgid "Hours cannot be null" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21 -msgid "NavalPlan: Scheduling progress report" +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:469 +msgid "resource type does not allow enabled criteria" msgstr "" #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:32 @@ -2367,38 +2437,38 @@ msgid "Unschedule" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:51 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:216 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:38 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:42 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:175 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:48 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:65 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:97 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:41 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:110 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:84 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:77 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:148 #: navalplanner-webapp/src/main/webapp/common/layout/template.zul:89 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:130 -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:40 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:84 -#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:49 -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:78 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:87 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:101 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:156 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:181 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:112 -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:39 -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:43 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:130 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:84 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:77 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:132 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:65 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:97 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:42 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:46 #: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:33 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:132 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:38 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:42 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:217 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:175 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:40 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:139 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:84 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:39 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:43 +#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:78 +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:79 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:61 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:116 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:141 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:40 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:84 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:130 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:110 msgid "Cancel" msgstr "" @@ -2415,24 +2485,25 @@ msgstr "" msgid "Subcontracted task sent successfully" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:207 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:21 msgid "Machines List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:61 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:129 msgid "CPI" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:8 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:9 -#: navalplanner-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:17 -msgid "Units" +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:53 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:47 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:52 +msgid "Dates" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:52 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:47 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:45 -msgid "Dates" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:258 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:37 +msgid "Units" msgstr "" #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:39 @@ -2443,7 +2514,7 @@ msgstr "" msgid "At least one stretch is needed" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:311 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:302 msgid "a day is not valid" msgstr "" @@ -2455,36 +2526,34 @@ msgstr "" msgid "Task Properties" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:414 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:477 +#: 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:450 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:515 msgid "There is no resource with this nif" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:12 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:32 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27 msgid "name" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:35 -msgid "Create new Work Report Type" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:168 -msgid "Cost category saved" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:192 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:225 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:228 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:244 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:211 msgid "" "End date is not valid, the new end date must be greater than the start date" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:169 +msgid "Cost category saved" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java:118 msgid "{0} (max: {1})" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:542 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:602 msgid "end" msgstr "" @@ -2501,18 +2570,22 @@ msgstr "" msgid "Continue" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:197 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:216 msgid "Start date cannot be null" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java:49 -msgid "Generic" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:236 +msgid "Subcontracting" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1138 msgid "Value is not valid, the Precision value must be exact " msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java:49 +msgid "Generic" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java:127 msgid "Order does not exist" msgstr "" @@ -2530,50 +2603,47 @@ msgstr "" msgid "Default max value" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:372 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionBandboxFinder.java:46 +msgid "Criterion Name" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:460 msgid "Automatic" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:126 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:134 msgid "Task" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:233 -msgid "Manage external companies" -msgstr "" - +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:127 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:123 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:149 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:269 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:197 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:84 msgid "please, select a label" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:391 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:396 msgid "Calculate End Date" msgstr "" -#: navalplanner-webapp/src/main/webapp/labels/labelTypes.zul:20 -msgid "NavalPlan: Label types" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/users/users.zul:22 -msgid "NavalPlan: User accounts" -msgstr "" - #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:106 msgid "Add profile" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:214 msgid "filter already exists" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:233 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:223 msgid "missing code in a calendar data version" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:17 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:21 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:37 #: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:26 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:45 msgid "Criterion name" msgstr "" @@ -2585,7 +2655,7 @@ msgstr "" msgid "Task name" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:127 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:127 msgid "cost assignment's resource not specified" msgstr "" @@ -2601,12 +2671,12 @@ msgstr "" msgid "Select the date from which the new version will be valid" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1311 -msgid "This advance measurement can not be in " +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:123 +msgid "Budgeted Cost Work Performed" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:55 -msgid "Budgeted Cost Work Performed" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1311 +msgid "This advance measurement can not be in " msgstr "" #: navalplanner-webapp/src/main/webapp/common/configuration.zul:79 @@ -2617,23 +2687,27 @@ msgstr "" msgid "the name must be not empty" msgstr "" -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:90 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:86 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:58 #: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:26 msgid "Disabled" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:287 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:333 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:462 msgid "Earned value" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:82 +msgid "Edit Work Hours Type" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:42 msgid "From Today" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:671 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:684 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:677 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:690 msgid "{0} not supported yet" msgstr "" @@ -2641,7 +2715,9 @@ msgstr "" msgid "New entry" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:48 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:104 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:113 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:213 msgid "Resources Load" msgstr "" @@ -2649,10 +2725,6 @@ msgstr "" msgid "Overload due to current order" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:46 -msgid "Overall Resources Load" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:118 msgid "Changes have been canceled" msgstr "" @@ -2662,11 +2734,11 @@ msgstr "" msgid "Machine saved" msgstr "" -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:21 -msgid "Advance type list" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:126 +msgid "Create Cost Category" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:81 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:101 msgid "Appropriative allocation" msgstr "" @@ -2674,9 +2746,9 @@ msgstr "" msgid "Assigned criterion requirements" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:16 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:12 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:14 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:36 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:34 msgid "Apply filtering to order elements satisfying required criteria" msgstr "" @@ -2689,7 +2761,7 @@ msgstr "" msgid "Max value" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:51 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:58 msgid "No" msgstr "" @@ -2702,7 +2774,7 @@ msgstr "" msgid "The name is not valid, the name must not be null " msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:129 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 msgid "Hours to allocate" msgstr "" @@ -2715,21 +2787,17 @@ msgstr "" msgid "Spread" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21 -msgid "NavalPlan: Working progress report" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:70 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:90 msgid "Select start date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:156 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:154 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:750 #: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:187 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:724 msgid "Removed {0}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:728 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:736 msgid "Confirm deleting this worker. Are you sure?" msgstr "" @@ -2737,7 +2805,7 @@ msgstr "" msgid "Group name" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:63 msgid "Start date:" msgstr "" @@ -2746,24 +2814,28 @@ msgstr "" msgid "Role name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:747 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:755 msgid "This worker was already removed by other user" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:411 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:623 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:459 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:610 msgid "h" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:588 +msgid "Create Work Report" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:114 msgid "Value is not valid, the precision value must not be empty" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:344 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:353 msgid "Workable capacity for this period " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:188 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:190 msgid "Cannot delete profile: it does not exist anymore" msgstr "" @@ -2771,36 +2843,40 @@ msgstr "" msgid "Unit Types" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1263 -msgid "Add new advance measurement" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:219 +msgid "Edit Machine" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java:99 msgid "Add Milestone" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:109 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:117 msgid "Assign selected items" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:520 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:580 msgid "init" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:415 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:503 msgid "Select for automatic queuing" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:241 +msgid "Scenarios Management" +msgstr "" + #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:95 msgid "Create & Assign" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:31 -msgid "Print layout" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:131 +msgid "Edit User" msgstr "" -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:23 -msgid "Edit User" +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:31 +msgid "Print layout" msgstr "" #: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:54 @@ -2816,51 +2892,32 @@ msgid "" "The date is not valid, the date must be unique for this advanced assignment" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:107 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:110 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:135 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:95 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:119 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:122 msgid "Consolidated" msgstr "" -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:21 -msgid "Profiles listing" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:211 -msgid "Work report types" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:216 msgid "missing code in a material" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:239 -msgid "Completed estimated hours" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:101 msgid "Customer" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:756 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:772 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:74 msgid "Hours type" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:155 -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:191 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:204 msgid "criterion type name not specified" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:232 -msgid "Manage user accounts" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:23 -msgid "Edit profile" -msgstr "" - #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:219 msgid "Add Exception" msgstr "" @@ -2871,18 +2928,14 @@ msgstr "" msgid "cannot be empty" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 -msgid "Completed estimated hours per task" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:47 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:48 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:47 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:6 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:6 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:26 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:26 msgid "from" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:145 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:146 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:105 msgid "Heading Fields" msgstr "" @@ -2893,7 +2946,7 @@ msgid "" "date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:209 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:210 msgid "A type must be selected" msgstr "" @@ -2902,115 +2955,130 @@ msgstr "" msgid "Day is not valid" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:474 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:907 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:489 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:911 msgid "You should select a start date for the exception" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:60 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:128 msgid "Variance At Completion" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:64 +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:70 #: navalplanner-webapp/src/main/webapp/common/layout/login.zul:48 msgid "Help" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:43 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:63 msgid "Exportation options" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:52 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:53 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:52 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ScenarioBandboxFinder.java:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplateFinder.java:51 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:87 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:354 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:499 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:952 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:39 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:51 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:24 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:54 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:106 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:32 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:26 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:37 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:160 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:26 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:78 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:47 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:111 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:152 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:97 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:126 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:166 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:100 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:141 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:98 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:138 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:179 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:98 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:33 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:49 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:40 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:125 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:149 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:26 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:58 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:108 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:68 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:39 +#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:26 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:30 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:49 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:53 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:75 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:27 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:48 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:109 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:40 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:76 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:26 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:25 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:40 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:72 +msgid "Name" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:159 msgid "" "Could not save time period. Time period overlaps with another non-compatible " "time period" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:87 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ScenarioBandboxFinder.java:47 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java:47 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:53 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplateFinder.java:51 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:52 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:52 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:952 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:354 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:26 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:33 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:49 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:40 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:121 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:145 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:36 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:26 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:23 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:38 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:24 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:24 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:32 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:30 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:51 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:106 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:54 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:34 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:25 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:62 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:26 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:40 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:72 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:25 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:39 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:51 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:73 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:88 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:78 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:54 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:73 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:26 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:76 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:27 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:97 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:48 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:68 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:27 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:108 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:30 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:49 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:53 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:75 -#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:26 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:40 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:76 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:37 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:161 -#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:26 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:39 -msgid "Name" +#: navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:42 +msgid ">>" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:42 -#: navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul:45 -msgid ">>" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:61 +msgid "Seconds" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:107 msgid "please, select an item" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:151 -msgid "Day of week" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:360 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:367 msgid "Time Start cannot be null" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:623 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:21 +msgid "Companies List" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:150 +msgid "Day of week" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:666 msgid "It not could remove the order element " msgstr "" @@ -3018,27 +3086,26 @@ msgstr "" msgid "Stretches with Interpolation" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java:143 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:265 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:49 +msgid "Hours Worked Per Resource" +msgstr "" + +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java:143 msgid "The end date cannot be before the init date" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationCommand.java:66 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:108 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:68 msgid "Advance consolidation" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:143 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:143 msgid "cost assignment with end date less than start date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1286 -msgid "" -"This advance can not be removed, because it is spread. It is necessary to " -"select another advance as spread." -msgstr "" - -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:14 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:34 msgid "Category name" msgstr "" @@ -3046,29 +3113,33 @@ msgstr "" msgid "Maximum/minimum of the worked hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:648 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:685 msgid "Not the same material, impossible to update" msgstr "" +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21 +msgid "NavalPlan: Work And Progress Per Task" +msgstr "" + #: navalplanner-webapp/src/main/webapp/common/layout/template.zul:55 msgid "Main menu" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:135 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:612 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:638 msgid "cannot include an Advance of the same Advance type twice" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:37 #: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:42 +#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:37 msgid "Create From Template" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:368 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:367 msgid "There exists other workReportType with the same name." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:149 #: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:28 msgid "Schedule" msgstr "" @@ -3077,7 +3148,11 @@ msgstr "" msgid "Unexpected: {0}" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:89 +msgid " {0}s" +msgstr "" + +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:127 msgid "worker's NIF not specified" msgstr "" @@ -3091,11 +3166,19 @@ msgstr "" msgid "Notes" msgstr "" +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:22 +msgid "NavalPlan: Transfer Projects Between Scenarios" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:223 msgid "Connect" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:212 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:20 +msgid "NavalPlan: Units" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:216 msgid "Allocation: [{0},{1}]" msgstr "" @@ -3107,59 +3190,69 @@ msgstr "" msgid "Changes saved" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1042 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1072 msgid "See scheduling" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1262 +msgid "Add measure" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:142 msgid "" "Some order was created during the configuration process, it is impossible to " "update order sequence table. Please, try again later" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:234 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:238 msgid "Work report saved" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:607 -msgid "Other orders" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:408 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java:52 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:75 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:421 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java:51 +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:66 msgid "Subcontract" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29 -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26 -msgid "Relationship" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:632 +msgid "Other orders" msgstr "" +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:118 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:36 #: navalplanner-webapp/src/main/webapp/planner/main.zul:56 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:98 msgid "End" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:546 -msgid "There are not any assigned advance to current task" +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29 +msgid "Relationship" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1177 msgid "The date is not valid, the date must be not empty" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:546 +msgid "There are not any assigned advance to current task" +msgstr "" + #: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:25 msgid "User login name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:427 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:488 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:253 +msgid "Cost Categories" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:95 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:167 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:463 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:526 msgid "There is no order element with this code" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:215 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:227 msgid "criterion type not specified" msgstr "" @@ -3169,24 +3262,36 @@ msgid "" "completed." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:142 -msgid "must be not empty" -msgstr "" - #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:69 msgid "Show all resource assignments" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:26 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:54 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:142 +msgid "must be not empty" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:22 +msgid "NavalPlan: Companies" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:21 +msgid "Users List" +msgstr "" + #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:51 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:54 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:26 msgid "Task quality forms" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:447 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:462 msgid "Not working day" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:28 +msgid "Cost category" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java:73 msgid "Resource allocation" msgstr "" @@ -3195,7 +3300,7 @@ msgstr "" msgid "please, select a quality form" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:387 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:386 msgid "Exist other workReportType with the same code." msgstr "" @@ -3207,32 +3312,32 @@ msgstr "" msgid "Customer reference code" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:139 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:143 msgid "Add New Label Type Field" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:370 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:377 msgid "Time finish cannot be null" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:108 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:108 msgid "Customer reference" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:487 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:497 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:318 #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:145 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:733 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:416 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:549 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:607 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:731 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:764 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:773 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:796 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:443 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:148 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:297 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:529 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:581 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:705 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:738 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:747 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:782 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:733 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:486 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:496 msgid "Information" msgstr "" @@ -3240,7 +3345,7 @@ msgstr "" msgid "END" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:193 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:194 msgid "Worker saved" msgstr "" @@ -3248,23 +3353,28 @@ msgstr "" msgid "can not pass until the previous item is passed." msgstr "" -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:36 -msgid "Create new advance type" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementModel.java:205 msgid "New hours group " msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:79 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:100 +#: navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:21 +msgid "NavalPlan: Quality Forms" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:422 +msgid "Assign element to queue manually" +msgstr "" + #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:100 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:79 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 msgid "Filter by orders" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:207 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:211 msgid "Resource: {0} " msgstr "" @@ -3272,6 +3382,14 @@ msgstr "" msgid "percentage cannot be duplicated" msgstr "" +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:53 +msgid "Edit Template" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:259 +msgid "Work Hours" +msgstr "" + #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:26 msgid "Heading" msgstr "" @@ -3288,7 +3406,7 @@ msgstr "" msgid "Unable to convert value to {0} type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:341 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:334 msgid "The calendar exception type not found" msgstr "" @@ -3296,12 +3414,12 @@ msgstr "" msgid "Worker must be not-null" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1014 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1015 msgid "Some criterion satisfactions overlap in time" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:593 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:529 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:551 msgid "New order version" msgstr "" @@ -3309,36 +3427,35 @@ msgstr "" msgid "Worker assignments" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:133 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:487 #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:149 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:115 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:142 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:308 #: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:220 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:389 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:411 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:476 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:980 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:115 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:142 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:308 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:979 #, java-format msgid "{0} already exists" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:272 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:273 msgid "Create Worker" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:17 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:37 msgid "Code " msgstr "" -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:52 -msgid "Password confirmation" -msgstr "" - #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:41 msgid "Paper size" msgstr "" +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:52 +msgid "Password confirmation" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1266 msgid "None" msgstr "" @@ -3351,24 +3468,24 @@ msgstr "" msgid "Work" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:119 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:406 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:494 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:402 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:119 #: navalplanner-webapp/src/main/webapp/common/event_error.zul:21 msgid "Error" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:62 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130 msgid "Cost Performance Index" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:160 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:179 msgid "" "Criterion is not valid, the criterion overlap other criterionSatisfaction " "whith same criterion" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:60 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:128 msgid "ETC" msgstr "" @@ -3376,10 +3493,6 @@ msgstr "" msgid "Log out" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:53 -msgid "Edit template" -msgstr "" - #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:23 msgid "Add new configuration unit" msgstr "" @@ -3388,7 +3501,7 @@ msgstr "" msgid "Main preferences" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:160 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:179 msgid "" "Criterion is not valid, it overlaps other criterionSatisfaction with the " "same criterion" @@ -3398,8 +3511,8 @@ msgstr "" msgid "Label type saved" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:384 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:527 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:419 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:568 msgid "missing field name in a description value" msgstr "" @@ -3407,7 +3520,7 @@ msgstr "" msgid "Add new worker assignment" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:409 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:408 msgid "Show all elements" msgstr "" @@ -3415,33 +3528,33 @@ msgstr "" msgid "Limited resource" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:86 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:80 msgid "Show dependencies:" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:132 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:133 msgid "Hours Group at " msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:21 -msgid "Work Report types" +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:65 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:59 +msgid "Total Estimated hours" msgstr "" #: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:26 msgid "Your session has expired after inactivity period. Please log in again." msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:55 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:62 -msgid "Total Estimated hours" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:139 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:164 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:165 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:190 msgid "SPREAD" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:53 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:304 +msgid "a day is empty" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:121 msgid "Budgeted Cost Work Scheduled" msgstr "" @@ -3449,7 +3562,7 @@ msgstr "" msgid "Name cannot be null or empty" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:11 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:31 msgid "Queue Element Information" msgstr "" @@ -3461,19 +3574,23 @@ msgstr "" msgid "Create Order" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:56 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:21 +msgid "Virtual Workers Groups List" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 msgid "Cost Variance" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:437 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:454 msgid "criterion type does not allow resource hierarchy" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:106 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:109 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:142 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:53 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:79 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:142 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:118 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:121 msgid "Total" msgstr "" @@ -3481,7 +3598,7 @@ msgstr "" msgid "A1" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:198 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:217 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:98 msgid "Invalidate" msgstr "" @@ -3490,11 +3607,11 @@ msgstr "" msgid "Budget hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:149 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:155 msgid "Edit task: {0}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1569 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1582 msgid "OrderElement not found" msgstr "" @@ -3504,8 +3621,8 @@ msgid "" "this quality form" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:506 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:259 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:506 msgid "must be greater than the previous date." msgstr "" @@ -3513,42 +3630,37 @@ msgstr "" msgid "NavalPlan: Advanced allocation" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java:514 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1399 -msgid "Show all" -msgstr "" - #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:44 msgid "A4" msgstr "" -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:27 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1412 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java:533 +msgid "Show all" +msgstr "" + #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:57 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:27 msgid "Default price" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:37 msgid "Estimated hours" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:132 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:144 msgid "Apply tab changes" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:234 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:236 msgid "passwords don't match" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:51 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:71 msgid "Hours groups" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:202 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:33 -msgid "Subcontracted tasks list" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:237 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:249 #: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:33 msgid "Create new order" msgstr "" @@ -3557,22 +3669,34 @@ msgstr "" msgid "Transfer" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:126 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:21 +msgid "Work Hours Types List" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:145 msgid "Unit {0} cannot be removed because it is used in materials" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:116 +msgid "Create User" +msgstr "" + #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:65 msgid "Reference date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:56 -msgid "CV" +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21 +msgid "NavalPlan: Task Scheduling Status In Project" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:105 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:117 msgid "Original" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 +msgid "CV" +msgstr "" + #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:30 msgid "Stretches function configuration" msgstr "" @@ -3587,7 +3711,7 @@ msgid "Not indentable" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:482 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:74 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:70 msgid "List of materials for all categories (select one to filter)" msgstr "" @@ -3595,11 +3719,7 @@ msgstr "" msgid "User disabled" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:234 -msgid "Manage scenarios" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:11 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:31 msgid "Order element name" msgstr "" @@ -3607,64 +3727,59 @@ msgstr "" msgid "Association with profiles" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:514 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:517 msgid "end date: {0} must be after start date: {1}" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:115 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:114 msgid "worker's surname not specified" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:207 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:208 msgid "Error on removing workReportType: " msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:47 #: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:47 msgid "Save changes" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:114 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:199 msgid "Total dedication" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:735 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:743 msgid "Worker deleted" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:17 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:42 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:37 msgid "Subcontratation date" msgstr "" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:23 -msgid "Edit external company" -msgstr "" - +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:120 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:58 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:121 msgid "Day" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:203 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:33 -msgid "Report advances" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:153 +msgid "Edit Label Type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:864 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1113 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:878 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1126 msgid "Please, select an item" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:170 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:168 msgid "Order version is the same in source and destination scenarios" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:176 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:177 msgid "Work report type saved" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1063 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1077 msgid "Cannot be higher than finish hour" msgstr "" @@ -3676,18 +3791,18 @@ msgstr "" msgid "New Template element" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:35 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:55 msgid "Subcontracted code" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:259 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:327 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:249 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:320 msgid "The base calendar parent not found" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:108 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:111 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:120 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:123 msgid "Non Consolidated" msgstr "" @@ -3696,33 +3811,45 @@ msgid "Reassigning type" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:48 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:119 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:125 -#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java:71 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java:46 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:120 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:133 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java:72 msgid "Order" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:856 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:252 +msgid "Edit Virtual Workers Group" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:403 +msgid "Edit limiting resource element" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:859 msgid "The field name must be unique, not null and not empty" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:360 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:123 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:146 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:127 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:77 msgid "Position" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:107 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:96 -msgid "Edit work report" +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:52 +msgid "Edit task" msgstr "" #: navalplanner-webapp/src/main/webapp/common/layout/login.zul:98 msgid "Incorrect authentication" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:99 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:96 +msgid "Edit work report" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:184 msgid "All order tasks" msgstr "" @@ -3730,7 +3857,7 @@ msgstr "" msgid "Value last advance measurement" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:758 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:761 msgid "A description field of the same name already exists." msgstr "" @@ -3738,13 +3865,17 @@ msgstr "" msgid "Current value" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:45 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:163 +msgid "Edit Quality Form" +msgstr "" + #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:51 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:45 msgid "Zoom level" msgstr "" #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:27 -#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:159 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:159 msgid "Quality form" msgstr "" @@ -3752,22 +3883,25 @@ msgstr "" msgid "Profile data" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:229 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 msgid "Configuration" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeModel.java:76 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeModel.java:95 msgid "It was not possible load entity. Not found. Id: " msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:503 +msgid "Create Virtual Workers Group" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:70 msgid "Total order element hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:506 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:835 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:878 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:512 msgid "Hours invested" msgstr "" @@ -3779,32 +3913,36 @@ msgstr "" msgid "Date last advance reported" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:647 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:648 msgid "ALL" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:220 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:220 msgid "criterion satisfaction's resource not specified" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:443 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:458 msgid "Derived exception" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:31 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:36 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:40 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:35 msgid "Resources search" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:232 +msgid "Machines" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:144 msgid "Couldn't find element: {0}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:177 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:179 msgid "Confirm deleting this profile. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:149 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:147 msgid "You should select a destination scenario" msgstr "" @@ -3813,11 +3951,6 @@ msgstr "" msgid "unit type code not found" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:200 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:44 -msgid "Limiting resources" -msgstr "" - #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:41 msgid "Resource :" msgstr "" @@ -3830,32 +3963,31 @@ msgstr "" msgid "Order element" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:197 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:106 -msgid "Company view" -msgstr "" - #: navalplanner-webapp/src/main/webapp/common/configuration.zul:21 msgid "NavalPlan: Configuration" msgstr "" +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:106 +msgid "Company view" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:129 msgid "Just one order sequence must be active" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:4 -msgid "Filter by" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:14 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:75 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:36 #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:75 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:34 msgid "Limiting resource" msgstr "" +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:24 +msgid "Filter by" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java:57 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:166 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:126 msgid "Calendar allocation" msgstr "" @@ -3863,22 +3995,26 @@ msgstr "" msgid "Choose a order element from which create a template from" msgstr "" -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:89 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:12 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:13 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:111 -msgid "Category" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:37 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:43 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:46 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:41 msgid "Order Element Information" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:154 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:85 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:111 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:33 +msgid "Category" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:184 msgid "must be greater than finish date" msgstr "" +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 +msgid "NavalPlan: Materials Needs At Date" +msgstr "" + #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:26 msgid "Category data" msgstr "" @@ -3887,7 +4023,7 @@ msgstr "" msgid "Search" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:115 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:119 msgid "Add New Complementary Field" msgstr "" @@ -3895,37 +4031,37 @@ msgstr "" msgid "Source scenario" msgstr "" +#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:49 +msgid "Remove calendar" +msgstr "" + #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:124 msgid "%" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:49 -#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:42 -msgid "Remove calendar" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1466 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1630 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:583 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:495 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:139 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:207 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:584 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:169 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1479 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1643 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:893 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1137 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:183 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:300 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:833 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1107 msgid "must be lower than finish date" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:82 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:84 msgid "Order Element" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:711 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:288 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:159 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:719 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:72 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:160 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:69 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:119 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:71 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33 msgid "Resource" msgstr "" @@ -3934,6 +4070,11 @@ msgstr "" msgid "Could not load any resource" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:266 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 +msgid "Work And Progress Per Project" +msgstr "" + #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:34 msgid "Material search" msgstr "" @@ -3944,19 +4085,19 @@ msgid "" "strategy" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:10 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:30 msgid "sub elements" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:147 -msgid "Default Label" +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:88 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:180 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:104 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:136 +msgid "Close" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:176 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:88 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:124 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:93 -msgid "Close" +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:151 +msgid "Default Label" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateController.java:108 @@ -3964,7 +4105,7 @@ msgstr "" msgid "error doing reassignation: {0}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:319 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:318 msgid "Time filter" msgstr "" @@ -3976,53 +4117,69 @@ msgstr "" msgid "Company data" msgstr "" +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:33 +msgid "Work Report Lines List" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:206 +msgid "Unit type code cannot be empty" +msgstr "" + #: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:21 msgid "Criterions Requirement" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:185 -msgid "Unit type code cannot be empty" -msgstr "" - #: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:46 msgid "Average of the estimated hours" msgstr "" +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:49 +msgid "Length percentage" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:158 +msgid "Create Unit Type" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:176 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:243 msgid "Quality form saved" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:49 -msgid "Length percentage" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:247 +msgid "Users" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:136 msgid "Label Type fields" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:93 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:96 msgid "Hours Management" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:146 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:42 +msgid "specific allocation" +msgstr "" + +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:146 msgid "company name has to be unique. It is already used" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:206 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:219 +msgid "Template saved" +msgstr "" + #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:62 msgid "Type of day" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:200 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:213 -msgid "Template saved" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:536 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:577 msgid "work report have not any description value with this field name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:160 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:162 msgid "User saved" msgstr "" @@ -4030,34 +4187,29 @@ msgstr "" msgid "Task quality form name" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:22 -msgid "NavalPlan: Work report admin query" +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1045 +msgid "Some cost category assignments overlap in time" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1044 -msgid "Some cost category assignments overlap in time" +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:30 +#: navalplanner-webapp/src/main/webapp/common/error.zul:36 +msgid "Exit session" msgstr "" #: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:30 #: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:52 #: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:66 -#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineGroupTemplate.java:274 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineGroupTemplate.java:274 msgid "Group" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/error.zul:36 -#: navalplanner-webapp/src/main/webapp/common/event_error.zul:30 -msgid "Exit session" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:55 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:26 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:62 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:55 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 msgid "Enabled" msgstr "" @@ -4065,11 +4217,15 @@ msgstr "" msgid "Statistics list " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:297 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:175 +msgid "All resources must be limiting. " +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:296 msgid "Filter by worker" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:414 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:441 msgid "" "The task has got advance consolidations.It must delete all consolidations to " "change the resource allocation type " @@ -4079,8 +4235,8 @@ msgstr "" msgid "NavalPlan: Machines" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:43 #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:41 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:43 msgid "Assigned hours" msgstr "" @@ -4096,41 +4252,41 @@ msgstr "" msgid "Show all labels" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:297 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:295 msgid "Incompatible update: stored resource is not of type: {0}" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:212 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:75 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:86 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:94 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:112 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:130 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:37 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:41 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:213 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:171 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:86 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:112 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:94 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:40 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:39 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:137 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:82 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:127 #: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:38 #: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:41 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:107 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:75 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:128 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:127 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:137 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:82 msgid "Save & Continue" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:45 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:52 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:54 -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:25 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:2 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:2 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:22 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:22 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29 msgid "Filter" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:581 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:607 msgid "Order saved" msgstr "" @@ -4138,36 +4294,36 @@ msgstr "" msgid "Assigned locations" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:238 -msgid "Hours worked per worker" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:217 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:238 msgid "Unit type saved" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:501 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:557 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:533 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:589 msgid "Order element {0} : OrderLineGroup is incompatible type with {1}" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:161 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:163 msgid "Two hour costs with the same type overlap in time" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:63 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:194 +msgid "Create Machine" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:63 msgid "Ok" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:54 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:122 msgid "ACWP" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:48 +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:54 msgid "START" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:406 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:419 msgid "Non limiting resource assignation" msgstr "" @@ -4181,25 +4337,24 @@ msgstr "" msgid "Subcontractor" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:220 #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:40 -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:32 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:32 msgid "Administration" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1449 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1612 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:566 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:478 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:567 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1462 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1625 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:875 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1120 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:166 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:281 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:815 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1090 msgid "must be greater than start date" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:35 -msgid "Work report listing" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:84 +msgid "Create Company" msgstr "" #: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:46 @@ -4215,38 +4370,38 @@ msgstr "" msgid "Delete item {0}. Are you sure?" msgstr "" +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:38 +msgid "worked hours" +msgstr "" + #: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:49 msgid "Unit measure name" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:37 -msgid "worked hours" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:451 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:489 msgid "a work report line has not this label type assigned" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:90 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:71 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:74 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:94 msgid "Allocations" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:122 -msgid "Length" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:33 #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:83 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:33 msgid "Capacity" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:177 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:126 +msgid "Length" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:337 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:177 msgid "Create derived" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:476 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:479 msgid "it must be greater than zero" msgstr "" @@ -4262,15 +4417,23 @@ msgstr "" msgid "Removed calendar \"{0}\"" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:103 msgid "START_IN_FIXED_DATE" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:74 +#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:21 +msgid "Unit Types List" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:37 +msgid "Edit Criterion Type" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:76 msgid "as soon as possible" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:163 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:163 msgid "company NIF has to be unique. It is already used" msgstr "" @@ -4278,14 +4441,14 @@ msgstr "" msgid "Human hours per machine working hour within configuration unit" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:110 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:112 msgid "" "Could not add those authorizations to user {0} because they were already " "present." msgstr "" +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:102 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:46 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:101 msgid "New work report" msgstr "" @@ -4293,15 +4456,15 @@ msgstr "" msgid "A3" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:90 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:110 msgid "Select gap" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:61 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:62 msgid "Date Finish" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:219 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:94 msgid "Validate" msgstr "" @@ -4311,17 +4474,21 @@ msgstr "" msgid "Edit order element" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:34 -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:3 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:142 +msgid "This resource has already been added." +msgstr "" + #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:23 msgid "Cost category assignment" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:145 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:149 msgid "missing code in a hour cost" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:487 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:493 msgid "All workers" msgstr "" @@ -4329,88 +4496,96 @@ msgstr "" msgid "Label saved" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:5 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:3 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:3 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector_combo.zul:30 +msgid "Select criteria or resources" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:25 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:23 msgid "Select required criteria set and press filter button" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:173 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:174 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:175 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:302 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:265 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:280 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:309 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:266 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:175 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:176 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:177 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:302 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:114 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:133 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:42 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:68 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:48 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:127 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:46 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:42 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:43 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:54 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:42 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:48 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:96 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:68 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:46 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:127 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:48 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:39 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:38 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:134 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:92 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:40 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:44 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:42 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:32 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:43 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:49 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:82 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:86 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:42 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:43 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:54 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:18 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:20 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:32 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:39 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:44 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:42 msgid "cannot be null or empty" msgstr "" +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21 +msgid "NavalPlan: Work And Progress Per Project" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:51 #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:61 msgid "New code" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:404 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:409 msgid "Calculate Resources per Day" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:990 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:993 msgid "The index fields and labels must be uniques and consecutives" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:129 +msgid "Estimate To Complete" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:249 msgid "" "Are you sure of changing the resource type? You will lose the criterions " "with different resource type." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:61 -msgid "Estimate To Complete" +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:21 +msgid "NavalPlan: Estimated/Planned Hours Per Task" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:511 msgid "Cannot delete that material because it is assigned to an order." msgstr "" -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:88 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:9 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:10 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:29 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:84 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:109 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:30 msgid "Unit type" msgstr "" -#: navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:22 -msgid "NavalPlan: Type of work hours" -msgstr "" - #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:41 msgid "Load due to other assignments" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:204 msgid "Order: {0} " msgstr "" @@ -4418,19 +4593,29 @@ msgstr "" msgid "This machine was already removed by other user" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:234 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:260 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:264 +msgid "Work Reports" +msgstr "" + #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:25 msgid "Calendar data" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:140 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:140 msgid "login name is already being used by another user" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:106 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:21 +msgid "Cost Categories List" +msgstr "" + +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:106 msgid "code is already used" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:67 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:71 msgid "Task start :" msgstr "" @@ -4438,30 +4623,35 @@ msgstr "" msgid "Criterion Requirements" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:702 -msgid "Calculated advances can not be removed" +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:110 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:122 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:151 +msgid "Workable Time" msgstr "" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:21 -msgid "External companies listing" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:702 +msgid "Calculated advances can not be removed" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java:210 msgid "Order from client" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:167 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:49 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:68 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:68 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:168 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:126 msgid "OrderElement Code" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:231 -msgid "Manage user profiles" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:32 +msgid "Customer Reference" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:125 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:138 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:617 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:643 msgid "spread values are not valid, at least one value should be true" msgstr "" @@ -4469,11 +4659,11 @@ msgstr "" msgid "Create and assign label" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:56 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 msgid "SV" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1401 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1414 msgid "Filter work reports" msgstr "" @@ -4481,10 +4671,6 @@ msgstr "" msgid "Our company login" msgstr "" -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:21 -msgid "Cost categories listing" -msgstr "" - #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:26 msgid "Direct imputation" msgstr "" @@ -4493,7 +4679,7 @@ msgstr "" msgid "Price per hour" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:250 msgid "Calendars" msgstr "" @@ -4501,31 +4687,27 @@ msgstr "" msgid "NavalPlan: Page not found" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:323 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:330 msgid "The date cannot be null" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:22 -msgid "NavalPlan: Work report types" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:392 msgid "Error on showing delete confirm" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:10 -msgid "Show only current satisfied criteria" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:69 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:89 msgid "Latest date" msgstr "" -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:21 -msgid "Users listing" +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:30 +msgid "Show only current satisfied criteria" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:650 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:21 +msgid "NavalPlan: Advances" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:666 msgid "Sum of all rows" msgstr "" @@ -4541,13 +4723,17 @@ msgstr "" msgid "Done {0} of {1}" msgstr "" +#: navalplanner-webapp/src/main/webapp/users/users.zul:22 +msgid "NavalPlan: Accounts" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:337 -#: navalplanner-business/src/main/java/org/navalplanner/business/common/daos/OrderSequenceDAO.java:72 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/common/daos/OrderSequenceDAO.java:72 msgid "You can not remove this order sequence, it is already in use" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:153 -msgid "Edit label type" +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:22 +msgid "NavalPlan: Scenarios Management" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:138 @@ -4560,9 +4746,9 @@ msgstr "" msgid "Each worker configuration unit name" msgstr "" +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:132 #: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:40 #: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:41 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:132 msgid "Active" msgstr "" @@ -4571,8 +4757,8 @@ msgstr "" msgid "Value is not valid, the current value must be not empty" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:285 #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:545 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:285 msgid "Unindent" msgstr "" @@ -4580,7 +4766,7 @@ msgstr "" msgid "Direct labels" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:157 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:161 msgid "Delete order element" msgstr "" @@ -4588,7 +4774,8 @@ msgstr "" msgid "Log in" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:56 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:294 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:312 msgid "Order Scheduling" msgstr "" @@ -4600,10 +4787,14 @@ msgstr "" msgid "Date last advance measurement" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:339 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:372 msgid "missing code in a work report line" msgstr "" +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:21 +msgid "NavalPlan: Subcontracted Tasks" +msgstr "" + #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:28 msgid "Indirect labels" msgstr "" @@ -4612,14 +4803,14 @@ msgstr "" msgid "Scheduling state" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:135 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:70 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:50 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:48 -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:43 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:64 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:51 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:70 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:50 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:136 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:43 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:60 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:51 msgid "Generate code" msgstr "" @@ -4633,16 +4824,16 @@ msgstr "" msgid "Select print page properties" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:211 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21 +msgid "NavalPlan: Project Costs Per Resource" +msgstr "" + +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:211 msgid "criterion satisfaction's criterion not specified" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:290 -msgid "Machine" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/common/error.zul:35 #: navalplanner-webapp/src/main/webapp/common/event_error.zul:29 +#: navalplanner-webapp/src/main/webapp/common/error.zul:35 msgid "Reload" msgstr "" @@ -4656,34 +4847,37 @@ msgstr "" msgid "Edit order element {0}" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:233 +msgid "Virtual Workers Groups" +msgstr "" + #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:25 msgid "Profiles authorization" msgstr "" +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:90 +msgid "Assignation" +msgstr "" + #: navalplanner-webapp/src/main/webapp/common/configuration.zul:98 msgid "Planning charts expanded" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:79 -msgid "Assignation" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1263 +msgid "Add new advance measurement" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:425 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:316 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:45 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:428 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:45 msgid "Not deletable" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:148 -msgid "Create quality form" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:71 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:34 #: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:26 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:45 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:77 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:71 msgid "NIF" msgstr "" @@ -4693,11 +4887,15 @@ msgid "" "Newly order elements cannot be used." msgstr "" +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39 +msgid "Edit Advance Type" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:168 msgid "Doing {0} reassignations" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:45 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:45 msgid "code not specified" msgstr "" @@ -4705,40 +4903,44 @@ msgstr "" msgid "Confirmation" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:186 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:187 msgid "" "Cannot delete work report type. There are some work reports bound to it." msgstr "" +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:21 +msgid "Criterion Type List" +msgstr "" + #: navalplanner-webapp/src/main/webapp/common/layout/login.zul:73 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:47 msgid "Password" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:87 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 msgid "Observations" msgstr "" #: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:26 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:163 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:185 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:209 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:162 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:184 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:208 msgid "Valid from" msgstr "" +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:56 +msgid "Month" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:289 msgid "There exists other template with the same name." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:214 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:204 msgid "exception date already exists" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:56 -msgid "Month" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:733 msgid "Advanced assignment saved" msgstr "" @@ -4747,7 +4949,7 @@ msgstr "" msgid "At least one order sequence is needed" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:777 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:808 msgid "Edit order" msgstr "" @@ -4755,21 +4957,25 @@ 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 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:194 msgid "criterion satisfaction's start date not specified" msgstr "" +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:36 +msgid "Create Advance Type" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:50 #: navalplanner-webapp/src/main/webapp/common/layout/template.zul:87 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:130 +#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:47 +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:77 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:59 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:114 #: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:38 #: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:42 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:82 -#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:47 #: navalplanner-webapp/src/main/webapp/planner/main.zul:65 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:85 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:99 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:154 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:110 msgid "Accept" msgstr "" @@ -4782,12 +4988,13 @@ msgid "" "Create new material assignment out of material assignment {0}. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:238 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:261 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:239 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:262 +#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:39 msgid "Edit Worker" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:192 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:193 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:151 msgid "Work report lines" msgstr "" @@ -4796,23 +5003,23 @@ msgstr "" msgid "Calculated" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:202 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:206 msgid "Completed: {0}% " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:116 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:114 msgid "Error setting up edition form for Criterion Type with id: {0}" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:592 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:528 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:550 msgid "" "Confirm creating a new order version for this scenario and derived. Are you " "sure?" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:309 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:315 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:328 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:334 msgid " The " msgstr "" @@ -4820,17 +5027,17 @@ msgstr "" msgid "Access to the system" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:107 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:122 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:140 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:111 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:143 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:117 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:207 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179 msgid "Click on " msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:110 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:111 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:99 msgid "Report data" msgstr "" @@ -4848,11 +5055,7 @@ msgstr "" msgid "Report advance" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/InstanceNotFoundRecoverableErrorException.java:45 -msgid "instance not found" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:81 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:92 msgid "Priority" msgstr "" @@ -4860,51 +5063,54 @@ msgstr "" msgid "Landscape" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:392 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/InstanceNotFoundRecoverableErrorException.java:45 +msgid "instance not found" +msgstr "" + +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:409 msgid "criterion names must be unique inside a criterion type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:760 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:78 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplateFinder.java:51 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:63 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:130 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:50 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:65 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:78 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:776 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:39 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:65 #: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:39 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:35 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:43 #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:33 -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:35 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:63 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:85 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:46 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:74 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:26 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:25 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:39 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:74 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:85 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:89 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:110 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:55 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:74 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:7 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:45 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:25 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:81 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:7 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:72 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:27 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:83 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:120 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:98 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:95 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:50 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:64 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:131 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:35 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:59 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:81 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:107 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:72 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:27 #: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:48 #: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:52 #: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:74 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:26 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:46 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:74 msgid "Code" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:10 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:30 msgid "Filters" msgstr "" @@ -4912,28 +5118,25 @@ msgstr "" msgid "Add stretch" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:78 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:89 msgid "Assignation type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:216 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:201 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:220 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:235 msgid "" "Start date is not valid, the new start date must be lower than the end date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:501 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:934 -msgid "Hours for an exception day should be greater or equal than zero" -msgstr "" - #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:52 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:86 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:121 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:57 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:100 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:96 msgid "Start date" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:133 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:132 msgid "Update exception" msgstr "" @@ -4956,18 +5159,22 @@ msgid "Unit name" msgstr "" #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:56 msgid "Write" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:373 -msgid "Assign element to queue automatically" +#: navalplanner-webapp/src/main/webapp/labels/labelTypes.zul:20 +msgid "NavalPlan: Labels" msgstr "" #: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:38 msgid "Number of applications" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:461 +msgid "Assign element to queue automatically" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:42 msgid "Filter type" msgstr "" @@ -4978,12 +5185,18 @@ msgid "" "calendar popup or type in date directly)" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:192 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:450 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:465 msgid "Normal" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:282 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1286 +msgid "" +"This advance can not be removed, because it is spread. It is necessary to " +"select another advance as spread." +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:289 msgid "Date cannot be null" msgstr "" @@ -4992,30 +5205,34 @@ msgstr "" msgid "Advance type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:741 -msgid "This label type already is assigned to the work report type." +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:94 +msgid "Create Profile" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:512 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:286 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:461 -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:48 -msgid "Load" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:744 +msgid "This label type already is assigned to the work report type." msgstr "" #: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:27 msgid "New criterion" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:839 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:61 -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:62 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:332 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:461 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:511 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:48 +msgid "Load" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:882 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:61 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:59 #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:35 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:86 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:62 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:31 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:82 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:112 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:38 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:58 #: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:40 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:46 @@ -5026,55 +5243,66 @@ msgstr "" msgid "Expand all taskgroups" msgstr "" -#: navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:22 -msgid "NavalPlan: External companies" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:22 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:22 msgid "NavalPlan: Criteria" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:133 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:145 msgid "Go to advanced Allocation" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:505 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:508 msgid "already exists an allocation for criteria {0}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:453 -msgid "Invalid queue element" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:228 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:270 +msgid "Project Templates" msgstr "" #: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:42 msgid "Number of finished applications" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:478 +msgid "Invalid queue element" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:566 #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:575 #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:583 msgid "Unnasigned" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:402 -msgid "At least one HoursGroup is needed" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:100 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:110 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:135 +msgid "please, select a order" msgstr "" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:61 #: navalplanner-webapp/src/main/webapp/common/layout/login.zul:64 -#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:156 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:61 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:156 msgid "User" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:402 +msgid "At least one HoursGroup is needed" +msgstr "" + #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:69 msgid "Interacts with applications" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:256 +msgid "Virtual worker" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:168 msgid "Order {0} transfered" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:46 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:46 msgid "Multiple values per resource" msgstr "" @@ -5082,16 +5310,12 @@ msgstr "" msgid "Hours:" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:37 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:42 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:57 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:63 msgid "Split" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:33 -msgid "Work report lines listing" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/planner/order.zul:171 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:131 msgid "Select the calendar" msgstr "" @@ -5101,94 +5325,92 @@ msgid "" "consolidated. It is needed to remove its consolidation." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:719 -msgid "" -"You can not remove the order \"{0}\" because of any of its order elements " -"are already in use in some work reports and the order just exists in the " -"current scenario" +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:67 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:24 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:27 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:86 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:44 +msgid "Starting date" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:134 msgid "Order sequence prefixes can not be repeated" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:27 -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:32 -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:67 -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:18 -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:24 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:22 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:86 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:24 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:29 -msgid "Starting date" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 -msgid "NavalPlan: Timeline material report" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:745 +msgid "" +"You can not remove the order \"{0}\" because of any of its order elements " +"are already in use in some work reports and the order just exists in the " +"current scenario" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:965 msgid "Function" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:85 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:98 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:119 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:89 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:121 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:95 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:85 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:550 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:557 +msgid "Repeated Order code {0} in Order {1}" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:171 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:141 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:187 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:160 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:139 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:198 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157 msgid "Format" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:21 -msgid "Workers list" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:93 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:529 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:68 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:644 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1010 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:487 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:370 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:36 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:76 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:39 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:88 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:32 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:39 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:41 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:49 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:48 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:42 -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:23 -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:24 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:36 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:72 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:704 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1040 #: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:40 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:36 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:37 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:41 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:47 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:48 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:77 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:36 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:88 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:23 #: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:34 #: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:36 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:48 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:24 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:36 msgid "Edit" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:165 +msgid "Edit Unit Type" +msgstr "" + #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:96 msgid "Responsible" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:15 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:67 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:35 msgid "Init date" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:153 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:152 msgid "By default" msgstr "" @@ -5201,7 +5423,7 @@ msgstr "" msgid "New Description" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1119 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1120 msgid "" "resources cost category assignment codes must be unique inside a resource" msgstr "" @@ -5211,7 +5433,7 @@ msgstr "" msgid "XML" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:165 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:184 msgid "" "CriterionType is not valid, the criterionType overlap other " "criterionSatisfaction whith same criterionType" @@ -5221,10 +5443,10 @@ msgstr "" msgid "Unable to convert {0} value to {1} type" msgstr "" -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:87 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:10 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:11 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:83 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:110 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:31 msgid "Unit price" msgstr "" @@ -5236,12 +5458,12 @@ msgstr "" msgid "Reassigning" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:470 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:471 msgid "" "Cannot delete that cost category because there are resources assigned to it." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:481 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:484 msgid "{0} already assigned to resource allocation list" msgstr "" @@ -5249,32 +5471,48 @@ msgstr "" msgid "Unit Measure" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:400 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:407 msgid "The type of hours cannot be null." msgstr "" +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:21 +msgid "Label Types List" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:53 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:52 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:40 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:62 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:126 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionBandboxFinder.java:46 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:65 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:40 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:42 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:172 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:24 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:35 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:110 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:151 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:95 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:125 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:165 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:140 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:137 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:178 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:40 -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:58 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:65 -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:35 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:24 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:42 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:41 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:63 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:127 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:40 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:46 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:152 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:40 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:42 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:173 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:52 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:46 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:58 msgid "Type" msgstr "" @@ -5288,11 +5526,11 @@ msgstr "" msgid "Associated Criteria" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:53 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:121 msgid "BCWS" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:280 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:319 msgid " in the specified directory." msgstr "" @@ -5300,58 +5538,60 @@ msgstr "" msgid "Autogenerated" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1113 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1114 msgid "criterion satisfaction codes must be unique inside a resource" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:240 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 -msgid "Working progress per task" -msgstr "" - #: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:30 msgid "New order element name:" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:37 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:73 -msgid "Criterion" +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:359 +msgid "missing code in a work report." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:228 -msgid "Manage types of work hours" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:36 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:73 +msgid "Criterion" msgstr "" #: navalplanner-webapp/src/main/webapp/common/configuration.zul:65 msgid "Generate code for" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:45 msgid "Limiting resources (order)" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:364 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:443 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:397 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:481 #: navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/impl/LabelConverter.java:102 msgid "missing code in a label" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:54 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:122 msgid "Actual Cost Work Performed" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:246 +msgid "NavalPlan Configuration" +msgstr "" + #: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:50 msgid "Average of the worked hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:488 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:548 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" " and should not be empty" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorization.java:42 +#: /home/dpino/workspace/navalplan/scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorization.java:42 msgid "an authorization type must be set" msgstr "" @@ -5359,43 +5599,60 @@ msgstr "" msgid "Must start after (days since beginning project)" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:123 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:48 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:78 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:140 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:85 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:115 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:154 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:88 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:129 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:88 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:167 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:86 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:44 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:74 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:34 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:165 msgid "Add" msgstr "" -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:51 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:104 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:124 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:47 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:73 msgid "Unselect" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:464 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:479 msgid "You should select the type of exception" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:92 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:41 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:91 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:31 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:91 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:51 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:41 msgid "Deadline" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:704 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:730 msgid "You don't have permissions to edit this order" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:102 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:122 msgid "Filter by categories or materials" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:106 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:237 +msgid "Subcontracted Tasks" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:320 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:106 msgid "Advance measurements" msgstr "" @@ -5407,24 +5664,30 @@ msgstr "" msgid "Machine data" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:59 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:127 msgid "VAC" msgstr "" -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:27 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:33 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:54 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:27 msgid "Label type" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:245 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:189 msgid "Advanced Allocation" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:245 +msgid "Administration / Management" +msgstr "" + #: navalplanner-webapp/src/main/webapp/templates/templates.zul:58 msgid "Template Tree" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:505 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:33 msgid "Alpha" msgstr "" @@ -5434,12 +5697,12 @@ msgstr "" msgid "inconsistent parent code." msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:80 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:84 msgid "Recommended Allocation" msgstr "" #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:67 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:14 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:34 msgid "Status" msgstr "" @@ -5447,35 +5710,29 @@ msgstr "" msgid "Resource load view" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:21 -msgid "NavalPlan: Hours worked report" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:752 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:959 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:59 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:768 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:69 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:959 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:73 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:53 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:91 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:49 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:43 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:98 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:68 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:75 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:50 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:80 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:16 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:110 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:123 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:152 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:47 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:110 msgid "Hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:575 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:562 msgid "the date must be inside the visualization area" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:372 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:405 msgid "work report has not this label type assigned" msgstr "" @@ -5495,10 +5752,16 @@ msgstr "" msgid "The name of the criterion is empty." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:345 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:354 msgid " hours" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:227 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:137 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:151 +msgid "Limiting Resources Planning" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:740 msgid "The max value must be not empty" msgstr "" @@ -5507,13 +5770,13 @@ msgstr "" msgid "New label" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:327 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:331 +#: 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" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:64 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:55 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:75 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:68 msgid "Allocation configuration" msgstr "" @@ -5521,38 +5784,30 @@ msgstr "" msgid "Scenario \"{0}\" saved" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:31 +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:51 msgid "Subcontract price" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:251 -msgid "Edit virtual worker groups" +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:23 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:21 +msgid "Assigned criteria" msgstr "" #: navalplanner-webapp/src/main/webapp/common/layout/login.zul:47 msgid "Help on authentication (opens a new window)" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:30 -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:1 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:3 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:29 -msgid "Assigned criteria" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:864 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:867 msgid "The length must be greater than 0, and not null." msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:21 -msgid "Machines list" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:479 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:490 msgid "Could not save new calendar" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:132 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:151 msgid "Deleted unit type {0}" msgstr "" @@ -5560,6 +5815,10 @@ msgstr "" msgid "All advance types have already been assigned." msgstr "" +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:21 +msgid "Advance Types List" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:135 msgid "Couldn't find criterion {0}" msgstr "" @@ -5568,40 +5827,43 @@ msgstr "" msgid "Could not save the scenario" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:196 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:329 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:270 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41 +msgid "Task Scheduling Status In Project" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:197 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:353 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:40 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:329 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:40 msgid "Confirm" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:55 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:35 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:51 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:62 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:61 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:50 -#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:31 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:32 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:47 #: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:49 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:48 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:59 -#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:31 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:50 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:61 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:63 #: navalplanner-webapp/src/main/webapp/calendars/_list.zul:31 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:31 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:55 +#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:31 #: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:48 #: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:44 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:59 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:32 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:47 msgid "Create" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:41 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:78 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 msgid "Permissions" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1646 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1652 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1659 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1665 msgid "please, select a work report type" msgstr "" @@ -5609,319 +5871,369 @@ msgstr "" msgid "List of materials for category: {0}" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:11 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:12 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:32 msgid "Total price" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:221 -msgid "Manage advance types" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1149 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1161 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:430 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:313 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:728 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:598 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:262 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:283 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:248 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:413 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:427 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:140 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:160 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:247 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:412 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:426 #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:583 #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:589 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:366 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:673 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:313 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:598 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:736 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:651 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:863 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1056 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:231 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1161 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1173 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:433 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:262 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:283 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:387 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1255 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:199 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:384 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1255 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1026 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:647 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:859 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1062 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:177 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:42 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:82 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:42 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:50 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:65 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:54 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:69 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1056 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:179 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:689 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:366 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:42 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:68 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:116 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:131 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:89 #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:53 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:107 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:90 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:41 -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:41 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:53 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:90 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:39 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:54 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:85 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:50 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:45 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:54 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:120 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:161 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:135 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:175 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:109 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:150 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:110 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:106 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:147 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:188 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:83 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:42 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:103 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:66 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:78 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:101 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:90 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:101 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:66 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:53 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:109 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:39 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:60 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:90 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:120 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:39 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:66 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:53 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:109 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:41 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:90 msgid "Delete" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:30 -msgid "Number of assigned hours." -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:31 -msgid "Number of hours calculated by clock." -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:32 -msgid "Number of assigned hours and the time." -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:33 -msgid "heading" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:33 -msgid "line" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:32 -msgid "RESOURCE" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:33 -msgid "WORKER" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:34 -msgid "MACHINE" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1144 -msgid "yes" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1144 -msgid "no" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:53 -msgid "[generic all workers]" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:71 -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:112 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:71 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:112 msgid "You can not modifiy this order sequence, it is already in use" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:121 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:121 #, java-format msgid "number of digits must be between {0} and {1}" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java:121 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:34 +msgid "WORK_RELATIONSHIP" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:40 +msgid "LOCATION_GROUP" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:46 +msgid "LEAVE" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:52 +msgid "TRAINING" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:58 +msgid "JOB" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:64 +msgid "CATEGORY" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:53 +msgid "[generic all workers]" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:32 +msgid "RESOURCE" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:33 +msgid "WORKER" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:34 +msgid "MACHINE" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1145 +msgid "yes" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1145 +msgid "no" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java:121 msgid "Line" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueDependency.java:124 -msgid "A queue dependency has to have an origin different from destiny" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:30 +msgid "Number of assigned hours" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/QueuePosition.java:52 -msgid "Hour should be a value between 0 and 23" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:31 +msgid "Number of hours calculated by clock" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31 -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:29 -msgid "Pending" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:32 +msgid "Number of assigned hours and the time" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31 -msgid "Failed sent" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:33 +msgid "heading" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:32 -msgid "Success sent" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:33 +msgid "line" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:27 -msgid "Finished" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:31 +msgid "RECEIVED" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:28 -msgid "In progress" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:32 +msgid "PENDING" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:30 -msgid "Blocked" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:33 +msgid "ORDERED" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:186 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:34 +msgid "PROCESSING" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:35 +msgid "CANCELED" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java:899 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:646 +msgid "Cannot spread two advances in the same order element" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:567 +msgid "" +"Some ancestor has the same label assigned, so this element is already " +"inheriting this label" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:670 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:697 +msgid "Duplicate Advance Assignment For Order Element" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:259 +msgid "workHours should be greater or equals to 0" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:271 +msgid "" +"\"workHours\" value is not valid, taking into account the current list of " +"HoursGroup" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:186 msgid "the resource type should be Worker or Machine" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:195 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:195 msgid "Working hours shouldn't be negative" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:224 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:224 msgid "Total percentage should be less than 100%" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:273 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:273 #, java-format msgid "" " The criterion {0} can not be assigned to this hoursGroup because its " "resource type is diferent." msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:279 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:279 #, java-format msgid "" " The criterion {0} can not be assigned to this hoursGroup because it " "already exist into the hoursGroup." msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:168 -#, java-format -msgid "{0} is already child of another {1}" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 +msgid "OFFERED" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:214 -msgid "it's already somewhat scheduled" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 +msgid "ACCEPTED" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:228 -msgid "it can't be unscheduled" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 +msgid "STARTED" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:366 -msgid "Completely scheduled" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 +msgid "FINISHED" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:368 -msgid "Partially scheduled" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 +msgid "CANCELLED" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:370 -msgid "Unscheduled" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 +msgid "SUBCONTRACTED PENDING ORDER" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:376 -msgid "C" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 +msgid "STORED" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:378 -msgid "P" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:380 -msgid "U" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:568 -msgid "" -"Some ancestor has the same label assigned, so this element is already " -"inheriting this label" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:647 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java:881 -msgid "Cannot spread two advances in the same order element" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:671 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:698 -msgid "Duplicate Advance Assignment For Order Element" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java:536 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java:536 #, java-format msgid " The {0} already exist into other order element" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 -msgid "OFFERED" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:168 +#, java-format +msgid "{0} is already child of another {1}" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 -msgid "ACCEPTED" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:214 +msgid "it's already somewhat scheduled" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 -msgid "STARTED" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:228 +msgid "it can't be unscheduled" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 -msgid "FINISHED" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:366 +msgid "Completely scheduled" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 -msgid "CANCELLED" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:368 +msgid "Partially scheduled" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 -msgid "SUBCONTRACTED PENDING ORDER" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:370 +msgid "Unscheduled" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 -msgid "STORED" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:376 +msgid "C" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:259 -msgid "workHours should be greater or equals to 0" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:378 +msgid "P" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:271 -msgid "" -"\"workHours\" value is not valid, taking into account the current list of " -"HoursGroup" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:380 +msgid "U" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/scenarios/entities/Scenario.java:175 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:32 +msgid "Read authorization" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:33 +msgid "Write authorization" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:33 +msgid "Web service reader" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:34 +msgid "Web service writer" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:35 +msgid "All orders read allowed" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:36 +msgid "All orders edition allowed" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:37 +msgid "Order creation allowed" +msgstr "" + +#: ../navalplanner-business/src/main/java/org/navalplanner/business/scenarios/entities/Scenario.java:175 #, java-format msgid "Derived from {0}" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:32 -msgid "Read authorization" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/QueuePosition.java:52 +msgid "Hour should be a value between 0 and 23" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:33 -msgid "Write authorization" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueDependency.java:169 +msgid "A queue dependency has to have an origin different from destiny" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:33 -msgid "Web service reader" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31 +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:29 +msgid "Pending" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:34 -msgid "Web service writer" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31 +msgid "Failed sent" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:35 -msgid "All orders read allowed" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:32 +msgid "Success sent" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:36 -msgid "All orders edition allowed" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:27 +msgid "Finished" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:37 -msgid "Order creation allowed" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:28 +msgid "In progress" msgstr "" -msgid "Add measure" +#: ../navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:30 +msgid "Blocked" msgstr "" diff --git a/navalplanner-webapp/src/main/resources/metainfo/zk/lang-addon.xml b/navalplanner-webapp/src/main/resources/metainfo/zk/lang-addon.xml index 8db23478f..f17920593 100755 --- a/navalplanner-webapp/src/main/resources/metainfo/zk/lang-addon.xml +++ b/navalplanner-webapp/src/main/resources/metainfo/zk/lang-addon.xml @@ -17,6 +17,12 @@ /common/components/i18n.zul + + l10n + org.navalplanner.web.common.components.L10n + label + + calendarhighlighteddays org.navalplanner.web.common.components.CalendarHighlightedDays diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul index a64695a45..f66944980 100644 --- a/navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul +++ b/navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul @@ -28,7 +28,7 @@ -