From 80c4f7eac8dd8a42e6c2c35b88efaaa08bb5a031 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Fri, 8 Apr 2011 10:49:00 +0200 Subject: [PATCH] [i18n] Updated .pot files FEA: ItEr74S03CommunityMaterialItEr73S03 --- ganttzk/src/main/resources/i18n/keys.pot | 18 +- .../src/main/resources/i18n/keys.pot | 727 ++++++++++-------- 2 files changed, 401 insertions(+), 344 deletions(-) diff --git a/ganttzk/src/main/resources/i18n/keys.pot b/ganttzk/src/main/resources/i18n/keys.pot index c34169193..6625d01ab 100644 --- a/ganttzk/src/main/resources/i18n/keys.pot +++ b/ganttzk/src/main/resources/i18n/keys.pot @@ -10,9 +10,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 1.0.4\n" +"Project-Id-Version: 1.0.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-17 11:57+0100\n" +"POT-Creation-Date: 2011-04-08 10:41+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -46,7 +46,7 @@ msgstr "" msgid "Show/Hide Progress" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:85 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:88 msgid "by criteria" msgstr "" @@ -75,7 +75,7 @@ msgstr "" msgid "Task" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:84 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:87 msgid "by resources" msgstr "" @@ -99,7 +99,7 @@ msgstr "" msgid "See scheduling" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:422 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:449 msgid "filtering by name" msgstr "" @@ -152,7 +152,7 @@ msgstr "" msgid "Create Project" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:138 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:141 msgid "showing criteria" msgstr "" @@ -192,7 +192,7 @@ msgstr "" msgid "Show/Hide Critical path" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:135 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:138 msgid "showing resources" msgstr "" @@ -225,11 +225,11 @@ msgstr "" msgid "increasing zoom" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:388 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:415 msgid "Show all elements" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:387 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:414 msgid "All" msgstr "" diff --git a/navalplanner-webapp/src/main/resources/i18n/keys.pot b/navalplanner-webapp/src/main/resources/i18n/keys.pot index c67a3114f..53685141d 100644 --- a/navalplanner-webapp/src/main/resources/i18n/keys.pot +++ b/navalplanner-webapp/src/main/resources/i18n/keys.pot @@ -10,9 +10,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 1.0.4\n" +"Project-Id-Version: 1.0.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-17 11:57+0100\n" +"POT-Creation-Date: 2011-04-08 10:41+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -66,7 +66,7 @@ msgid "Create Virtual Worker" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:97 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:806 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:821 #: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:140 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:130 #: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:27 @@ -104,7 +104,7 @@ msgstr "" #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:122 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:101 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:230 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:231 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49 #: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28 @@ -183,8 +183,8 @@ msgstr "" msgid "login name not specified" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MonteCarloTabCreator.java:69 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MonteCarloTabCreator.java:266 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MonteCarloTabCreator.java:78 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MonteCarloTabCreator.java:354 msgid "MonteCarlo Method" msgstr "" @@ -225,7 +225,7 @@ msgstr "" msgid "Reports" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:169 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:167 msgid "The {0} sequence prefixes can not be repeated" msgstr "" @@ -245,8 +245,8 @@ msgstr "" msgid "Dedication chart" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:696 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:723 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:700 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:727 msgid "Progress that are reported by quality forms can not be modified" msgstr "" @@ -306,11 +306,11 @@ msgstr "" msgid "Select print visualization options" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:782 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:797 msgid "Hour start" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:883 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:896 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:515 msgid "The project has no scheduled elements" msgstr "" @@ -333,8 +333,8 @@ msgstr "" msgid "Delete Template element" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/order.zul:90 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:97 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:89 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:96 msgid "Progress Consolidation" msgstr "" @@ -385,7 +385,7 @@ msgstr "" msgid "Project Name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:925 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:930 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:303 msgid "Indent" msgstr "" @@ -445,7 +445,7 @@ msgstr "" msgid "Current selection" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1135 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1116 msgid "" "there exist criterion satisfactions referring to criterion types not " "applicable to this resource" @@ -493,7 +493,7 @@ msgstr "" 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:151 +#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java:152 msgid "material category name has to be unique. It is already used" msgstr "" @@ -508,8 +508,8 @@ msgstr "" msgid "Project Costs Per Resource" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:452 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:140 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:461 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:142 msgid "Confirm deleting this hour cost. Are you sure?" msgstr "" @@ -559,10 +559,10 @@ msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:179 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:136 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:837 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:850 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:198 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:198 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1192 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1219 #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:133 #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:290 #: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:124 @@ -596,7 +596,7 @@ msgstr "" msgid "View" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:307 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:309 msgid "Backwards" msgstr "" @@ -623,7 +623,7 @@ msgid "" "same criterionType" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:104 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:105 msgid "Types of work hours" msgstr "" @@ -641,6 +641,10 @@ msgstr "" msgid "Predecessor" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/TreeElementOperationsController.java:55 +msgid "Please select a task" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:135 msgid "Some stretch has higher or equal values than the previous stretch" msgstr "" @@ -683,7 +687,7 @@ msgstr "" msgid "E-mail" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:208 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:209 msgid "Prefix:" msgstr "" @@ -694,7 +698,7 @@ msgid "This project has already been added." msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:275 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:644 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:579 #: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:35 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:47 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:45 @@ -702,6 +706,10 @@ msgstr "" msgid "Criteria" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:363 +msgid "The task code cannot be null" +msgstr "" + #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:26 msgid "User data" msgstr "" @@ -710,10 +718,6 @@ msgstr "" msgid "Resource / Criteria" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:363 -msgid "The task code cannot be null" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:84 msgid "AS_SOON_AS_POSSIBLE" msgstr "" @@ -758,7 +762,7 @@ msgstr "" msgid "please, select a Criterion" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:727 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:731 msgid "Calculated progress can not be removed" msgstr "" @@ -775,7 +779,7 @@ msgstr "" msgid "{0} annotation required on {1}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:1025 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:1030 msgid "Modified" msgstr "" @@ -783,7 +787,7 @@ msgstr "" msgid "Add Criterion" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:625 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:642 msgid "format prefix invalid. It cannot be empty or contain whitespaces." msgstr "" @@ -792,7 +796,7 @@ msgid "You can not remove the current scenario" msgstr "" #: 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:321 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:329 msgid "MessagesContainer is needed" msgstr "" @@ -817,7 +821,7 @@ msgstr "" msgid "Templates List" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:228 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:229 msgid "Last value" msgstr "" @@ -825,7 +829,7 @@ msgstr "" msgid "Subcontracted Tasks List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:700 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:704 msgid "Calculated progress can not be modified" msgstr "" @@ -866,7 +870,7 @@ msgstr "" msgid "NavalPlan: Work Hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:804 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:812 msgid "" "This worker cannot be deleted because it has assignments to projects or " "imputed hours" @@ -893,10 +897,14 @@ msgstr "" msgid "This Criterion has already been added." msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:214 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:215 msgid "add" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/TreeElementOperationsController.java:239 +msgid "Unsaved changes will be lost. Would you like to continue?" +msgstr "" + #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:40 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:34 msgid "Filter work report by :" @@ -932,7 +940,7 @@ msgstr "" msgid "Date Start" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1276 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1280 msgid "Value is not valid, the current value must be less than max value" msgstr "" @@ -944,7 +952,7 @@ msgstr "" msgid "Hour costs" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/order.zul:109 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:108 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:66 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:34 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:55 @@ -1003,7 +1011,7 @@ msgstr "" msgid "Profiles" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:786 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:801 msgid "Hour finish" msgstr "" @@ -1011,8 +1019,7 @@ msgstr "" msgid "Edit Work Report Type" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:109 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:172 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:173 msgid "Perspectives" msgstr "" @@ -1024,7 +1031,7 @@ msgstr "" msgid "missing code in a subcategory" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:466 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:475 msgid "Confirm deleting this cost category. Are you sure?" msgstr "" @@ -1077,7 +1084,7 @@ msgid "" "Deleting this item, it will disable the report progress option. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloModel.java:81 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloModel.java:83 #: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:68 msgid "Critical path" msgstr "" @@ -1105,6 +1112,7 @@ msgstr "" #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:117 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163 +#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:47 msgid " to go to output directly" msgstr "" @@ -1117,7 +1125,7 @@ msgid "Criteria: {0} " msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:384 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:110 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:109 #: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:62 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:44 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67 @@ -1129,7 +1137,7 @@ msgstr "" msgid "Updated" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:70 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:71 msgid "Company logo URL" msgstr "" @@ -1137,20 +1145,20 @@ msgstr "" msgid "No worker selected" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:226 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:227 msgid "Number of digits" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1601 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1628 msgid "Task not found" msgstr "" #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:38 -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:28 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:38 msgid "Total capability" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:657 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:663 msgid "It not could remove the task " msgstr "" @@ -1180,10 +1188,10 @@ msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:853 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:215 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:240 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:277 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:869 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:631 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:875 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:566 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:67 #: navalplanner-webapp/src/main/webapp/templates/templates.zul:63 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 @@ -1204,7 +1212,7 @@ msgstr "" msgid "Reassigning {0} projects" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:74 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:83 msgid "Create Work Hours Type" msgstr "" @@ -1212,7 +1220,7 @@ msgstr "" msgid "Filter by task status" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:472 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:471 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:422 msgid "Select date:" msgstr "" @@ -1234,7 +1242,7 @@ msgstr "" msgid "Unknown attribute '{0}' in class {1}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:696 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:704 msgid "NON LIMITING RESOURCE" msgstr "" @@ -1260,10 +1268,10 @@ msgstr "" msgid "already assigned" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/order.zul:155 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:154 #: 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/common/configuration.zul:118 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:119 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:130 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:68 msgid "Calendar" @@ -1279,7 +1287,7 @@ msgid "Read" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:255 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:98 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:99 msgid "Resources" msgstr "" @@ -1295,6 +1303,10 @@ msgstr "" msgid "scenario" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:94 +msgid " {0}m" +msgstr "" + #: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:40 #: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:28 #: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:29 @@ -1304,8 +1316,8 @@ msgstr "" msgid "to" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:94 -msgid " {0}m" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:178 +msgid "Error on removing typeOfWorkHours: " msgstr "" #: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:111 @@ -1370,7 +1382,7 @@ msgstr "" msgid "Stretches list" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:186 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:187 msgid "Enable scenarios module" msgstr "" @@ -1395,8 +1407,8 @@ msgstr "" #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:47 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:92 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:240 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:211 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:241 +#: 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 @@ -1412,7 +1424,7 @@ msgstr "" msgid "Save" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:108 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:109 msgid "Material categories" msgstr "" @@ -1436,7 +1448,7 @@ msgstr "" msgid "Problems connecting with subcontractor web service" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:38 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:43 msgid "Assigned load" msgstr "" @@ -1466,7 +1478,7 @@ msgid "" "popup or type in date directly)" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:345 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:280 msgid "Expand/Collapse all" msgstr "" @@ -1478,7 +1490,7 @@ msgstr "" msgid "Name: {0}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:861 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:866 msgid "Move down" msgstr "" @@ -1526,7 +1538,7 @@ msgstr "" msgid "missing code in a criterion" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1254 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1278 msgid "Create Template" msgstr "" @@ -1579,6 +1591,7 @@ msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:639 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:670 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1290 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:190 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:190 msgid "Warning" msgstr "" @@ -1694,9 +1707,9 @@ msgid "the name must be not null or not empty" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:392 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:727 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:742 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:48 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:111 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:110 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45 #: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45 @@ -1704,7 +1717,6 @@ msgstr "" #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:76 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:28 #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:156 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:66 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:67 @@ -1725,7 +1737,7 @@ msgstr "" msgid "NavalPlan: Exception Days" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:623 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:640 msgid "" "format prefix invalid. It cannot be empty or contain '_' or whitespaces." msgstr "" @@ -1774,7 +1786,7 @@ msgstr "" msgid "Select queue" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:504 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:513 msgid "The cost category had already been removed." msgstr "" @@ -1807,13 +1819,14 @@ msgstr "" #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:116 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:165 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:162 +#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:46 msgid "direct link" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:35 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:29 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:933 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:88 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:89 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:47 msgid "Label" msgstr "" @@ -1822,7 +1835,7 @@ msgstr "" msgid "Create Scenario" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:828 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:833 msgid "Value is not valid, taking into account the current list of HoursGroup" msgstr "" @@ -1853,6 +1866,7 @@ msgid "Estimate At Completion" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:322 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:175 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:199 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:372 msgid "Delete item. Are you sure?" @@ -1868,6 +1882,7 @@ msgstr "" #: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:167 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:178 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:102 +#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:35 msgid "Output format:" msgstr "" @@ -1876,7 +1891,7 @@ msgstr "" msgid "Direct" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:804 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:819 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:51 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:189 msgid "Op." @@ -1895,7 +1910,7 @@ msgstr "" msgid "Limiting resource assignation" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1230 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1234 msgid "" "This progress can not be removed, because it is spread. It is necessary to " "select another progress as spread." @@ -1961,19 +1976,19 @@ msgid "start not earlier than" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:187 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:460 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:474 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:147 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:845 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:469 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:483 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:149 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:858 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:206 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:261 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1227 #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:298 #: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:132 msgid "Error on showing removing element: " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:672 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:689 msgid "Deleting sequence" msgstr "" @@ -2001,12 +2016,6 @@ msgstr "" msgid "Criterion requirement" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:211 -msgid "" -"Still not saved changes would be lost. Are you sure you want to go to create " -"a template?" -msgstr "" - #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:34 msgid "PDF" msgstr "" @@ -2022,12 +2031,12 @@ msgstr "" #: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:26 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:68 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:197 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:196 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:155 msgid "Add new row" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:768 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:781 msgid "incorrect initialization of the progress assignment controller." msgstr "" @@ -2040,7 +2049,7 @@ msgid "missing code in the resource calendar" msgstr "" #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:33 -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:33 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:28 msgid "Overload" msgstr "" @@ -2076,7 +2085,7 @@ msgid "" "calendar is derived from this one." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:913 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:917 msgid "Value is not valid, the type must be not empty" msgstr "" @@ -2100,7 +2109,7 @@ msgstr "" msgid "Error setting up creation form for Criterion Type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:137 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:139 msgid "Edit Cost Category" msgstr "" @@ -2146,8 +2155,8 @@ msgstr "" msgid "ID" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:341 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:178 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:350 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:180 msgid "The init date cannot be empty" msgstr "" @@ -2194,7 +2203,7 @@ msgstr "" msgid "Unallocated name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:882 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:887 msgid "Move up" msgstr "" @@ -2256,7 +2265,7 @@ msgstr "" msgid "Confirm change" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:850 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:863 msgid "You don't have permissions to edit this project" msgstr "" @@ -2333,6 +2342,14 @@ msgstr "" msgid "Calendars List" msgstr "" +#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:21 +msgid "Resources List" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:28 +msgid "Receipt date" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:209 msgid "Cannot be higher than Ending date" msgstr "" @@ -2406,7 +2423,7 @@ msgstr "" msgid "Quarter" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1244 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1248 msgid "" "This progress measurement can not be in current date, because it is " "consolidated. it is necessary to select other date." @@ -2416,7 +2433,7 @@ msgstr "" msgid "Other projects" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:165 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:163 msgid "At least one {0} sequence must be active" msgstr "" @@ -2439,7 +2456,7 @@ msgstr "" msgid "You should select a source scenario" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:160 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:158 msgid "At least one {0} sequence is needed" msgstr "" @@ -2473,6 +2490,10 @@ msgstr "" msgid "Error: {0}" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/TreeElementOperationsController.java:240 +msgid "Confirm create template" +msgstr "" + #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:185 msgid "Parent" msgstr "" @@ -2481,7 +2502,7 @@ msgstr "" msgid "Earliest date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:116 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:125 msgid "Type of work hours saved" msgstr "" @@ -2526,7 +2547,7 @@ msgstr "" msgid "Question" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1241 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1245 msgid "" "This progress measurement can not be changed or removed, because it is " "consolidated. It is needed to remove its consolidation." @@ -2536,7 +2557,7 @@ msgstr "" msgid "Create new work week" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:695 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:703 msgid "LIMITING RESOURCE" msgstr "" @@ -2544,29 +2565,29 @@ msgstr "" msgid "Subcontratation" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:115 -msgid "Extended view" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:190 msgid "" "The meausure name is not valid. There is another unit type with the same " "measure name" msgstr "" +#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:115 +msgid "Extended view" +msgstr "" + #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:32 msgid "Work record" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:115 +msgid "Error setting up edition form." +msgstr "" + #: 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:115 -msgid "Error setting up edition form." -msgstr "" - #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:81 msgid "Print" msgstr "" @@ -2598,9 +2619,9 @@ msgstr "" #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:84 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:82 #: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:40 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:72 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:135 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:170 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:71 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:134 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:169 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:139 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:84 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:110 @@ -2612,9 +2633,9 @@ msgstr "" #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:77 #: navalplanner-webapp/src/main/webapp/common/layout/template.zul:91 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:242 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:243 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:81 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:217 +#: 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 @@ -2650,8 +2671,8 @@ msgstr "" msgid "Machines List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:651 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:892 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:659 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:905 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:525 msgid "You don't have read access to this project" msgstr "" @@ -2693,7 +2714,7 @@ msgstr "" msgid "Task Properties" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:172 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:180 msgid "Cost category saved" msgstr "" @@ -2713,15 +2734,15 @@ msgstr "" msgid "Progress type saved" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:70 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:71 msgid "Delete selected task" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java:122 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java:129 msgid "{0} (max: {1})" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:523 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:458 msgid "end" msgstr "" @@ -2738,7 +2759,7 @@ msgstr "" msgid "Continue" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java:119 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java:120 msgid "Edit task {0}" msgstr "" @@ -2755,7 +2776,7 @@ msgstr "" msgid "references" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1279 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1283 msgid "Value is not valid, the Precision value must be exact " msgstr "" @@ -2775,7 +2796,7 @@ msgstr "" msgid "Add criterion requirement" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:865 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:878 msgid "" "You can not remove the project \"{0}\" because of any of its tasks are " "already in use in some work reports and the project just exists in the " @@ -2837,7 +2858,7 @@ msgstr "" msgid "Criterion name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:126 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:130 msgid "values are not valid, the values must not be null" msgstr "" @@ -2873,11 +2894,11 @@ msgstr "" msgid "Budgeted Cost Work Performed" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:94 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:95 msgid "Work report" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:295 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:297 msgid "the name must be not empty" msgstr "" @@ -2887,12 +2908,19 @@ msgstr "" msgid "Disabled" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:599 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:598 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:349 msgid "Earned value" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:82 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/TreeElementOperationsController.java:250 +msgid "" +"Templates can only be created out of existent tasks.You are trying to create " +"a template out of a new task.\n" +"Please save your project before proceeding." +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:91 msgid "Edit Work Hours Type" msgstr "" @@ -2909,7 +2937,7 @@ msgstr "" msgid "New entry" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:217 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:215 msgid "Some sequences to remove not existed" msgstr "" @@ -2919,7 +2947,7 @@ msgstr "" msgid "Resources Load" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:207 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:210 msgid "Changes have been canceled" msgstr "" @@ -2928,7 +2956,7 @@ msgstr "" msgid "Machine saved" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:129 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:131 msgid "Create Cost Category" msgstr "" @@ -2970,7 +2998,7 @@ msgstr "" msgid "Hours to allocate" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:112 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:114 msgid "A category must be selected" msgstr "" @@ -2983,14 +3011,18 @@ msgstr "" msgid "Select start date" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:192 +msgid "Error on showing warning message removing typeOfWorkHours: " +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:187 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:152 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:870 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:883 #: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:150 msgid "Removed {0}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:792 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:800 msgid "Confirm deleting this worker. Are you sure?" msgstr "" @@ -3007,11 +3039,11 @@ msgstr "" msgid "Role name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:811 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:819 msgid "This worker was already removed by other user" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:679 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:678 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:475 msgid "h" msgstr "" @@ -3048,11 +3080,11 @@ msgstr "" msgid "Assign selected items" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:502 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:437 msgid "init" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1207 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1211 msgid "Add new progress measurement" msgstr "" @@ -3064,7 +3096,7 @@ msgstr "" msgid "Scenarios Management" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:165 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:191 msgid "Project {0} transfered" msgstr "" @@ -3090,15 +3122,15 @@ msgstr "" #: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:137 #: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:140 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:112 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:111 msgid "Consolidated" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:124 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:125 msgid "Work report types" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:181 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:182 msgid "MonteCarlo method" msgstr "" @@ -3117,7 +3149,7 @@ msgstr "" msgid "Customer" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:796 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:811 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:74 msgid "Hours type" @@ -3173,7 +3205,7 @@ msgstr "" msgid "Save Project" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:246 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:255 msgid "A type must be selected" msgstr "" @@ -3399,20 +3431,20 @@ msgstr "" msgid "Allocation: [{0},{1}]" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:193 msgid "Changes saved" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1239 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1263 msgid "See scheduling" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:106 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:333 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:337 msgid "Progress measurements" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1206 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1210 msgid "Add measure" msgstr "" @@ -3441,7 +3473,7 @@ msgstr "" msgid "Relationship" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1361 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1365 msgid "The date is not valid, the date must be not empty" msgstr "" @@ -3489,11 +3521,11 @@ msgid "Not working day" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:28 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:134 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:135 msgid "Cost category" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:671 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:688 msgid "It can not be deleted. At least one sequence is necessary." msgstr "" @@ -3509,7 +3541,7 @@ msgstr "" msgid "please, select a quality form" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:200 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:201 msgid "Select entity:" msgstr "" @@ -3517,7 +3549,7 @@ msgstr "" msgid "Exist other workReportType with the same code." msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:62 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:63 msgid "Unindent selected task" msgstr "" @@ -3555,18 +3587,18 @@ msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:454 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:747 #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:145 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:652 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:727 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:851 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:884 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:893 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:916 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:660 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:739 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:864 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:897 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:906 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:929 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:516 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:526 msgid "Information" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:915 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:928 msgid "Sorry, you do not have permissions to access this project" msgstr "" @@ -3574,7 +3606,7 @@ msgstr "" msgid "END" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:213 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:221 msgid "Worker saved" msgstr "" @@ -3646,7 +3678,7 @@ msgstr "" msgid "Worker must be not-null" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1048 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1049 msgid "Some criterion satisfactions overlap in time" msgstr "" @@ -3666,12 +3698,12 @@ msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:408 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:430 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:501 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:1026 +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:1034 #, java-format msgid "{0} already exists" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:301 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:309 msgid "Create Worker" msgstr "" @@ -3691,12 +3723,18 @@ msgstr "" msgid "Work Report" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:66 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:67 msgid "Indent selected task" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:189 +msgid "" +"Cannot delete type of work hours. It is being used at this moment in some " +"cost category." +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:278 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:114 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:115 msgid "Unit Measures" msgstr "" @@ -3748,7 +3786,7 @@ msgid "Main preferences" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationCommand.java:66 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:82 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:81 msgid "Progress consolidation" msgstr "" @@ -3819,7 +3857,7 @@ msgid "Name cannot be null or empty" 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:336 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:340 msgid "Progress measurements: " msgstr "" @@ -3835,6 +3873,10 @@ msgstr "" msgid "Create Order" msgstr "" +#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:1 +msgid "NavalPlan: Resources List" +msgstr "" + #: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:21 msgid "Virtual Workers Groups List" msgstr "" @@ -3883,7 +3925,7 @@ msgstr "" msgid "NavalPlan: Advanced allocation" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1431 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1458 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java:551 msgid "Show all" msgstr "" @@ -3913,7 +3955,7 @@ msgstr "" msgid "Hours groups" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:156 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:182 msgid "Transfer" msgstr "" @@ -3941,7 +3983,7 @@ msgstr "" msgid "Create User" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:305 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:307 msgid "Schedule from start to deadline" msgstr "" @@ -4042,17 +4084,17 @@ msgstr "" msgid "Total dedication" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:734 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:668 msgid "" "You can not remove the task \"{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/resources/worker/WorkerCRUDController.java:799 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:807 msgid "Worker deleted" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:709 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:726 msgid "Select entity, please" msgstr "" @@ -4060,7 +4102,7 @@ msgstr "" msgid "Stretch date must not be greater than the task's end date: " msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:211 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:212 msgid "Number of digits:" msgstr "" @@ -4069,12 +4111,6 @@ msgstr "" msgid "Subcontratation date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:249 -msgid "" -"Templates can only be created from already existent tasks.\n" -"Newly tasks cannot be used." -msgstr "" - #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:58 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:141 msgid "Day" @@ -4084,8 +4120,8 @@ msgstr "" msgid "Edit Label Type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:897 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1145 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:912 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1172 msgid "Please, select an item" msgstr "" @@ -4093,11 +4129,11 @@ msgstr "" msgid "Work report type saved" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1096 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1123 msgid "Cannot be higher than finish hour" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:224 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:225 msgid "Prefix" msgstr "" @@ -4128,7 +4164,7 @@ msgstr "" msgid "Reassigning type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:283 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:291 msgid "Edit Virtual Workers Group" msgstr "" @@ -4165,7 +4201,7 @@ msgstr "" msgid "Limiting resources (project)" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1169 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1173 msgid "" "Progress measurements that are reported by quality forms can not be removed" msgstr "" @@ -4217,12 +4253,12 @@ msgstr "" msgid "It was not possible load entity. Not found. Id: " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:551 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:559 msgid "Create Virtual Workers Group" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:845 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:858 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:864 msgid "Hours invested" msgstr "" @@ -4231,7 +4267,7 @@ msgid "" "The name is not valid, there is another progress type with the same name. " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:727 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:739 msgid "Project saved" msgstr "" @@ -4239,7 +4275,7 @@ msgstr "" msgid "task :" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:694 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:702 msgid "ALL" msgstr "" @@ -4263,7 +4299,7 @@ msgstr "" msgid "Confirm deleting this profile. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:148 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:152 msgid "Couldn't find element: {0}" msgstr "" @@ -4288,7 +4324,7 @@ msgstr "" msgid "Destination scenario" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:152 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:153 msgid "Company view" msgstr "" @@ -4296,7 +4332,7 @@ msgstr "" msgid "NavalPlan: Configuration" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:745 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:750 msgid "Not editable for containing more that an hours group." msgstr "" @@ -4310,7 +4346,7 @@ msgid "Limiting resource" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java:57 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:147 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:146 msgid "Calendar allocation" msgstr "" @@ -4364,20 +4400,20 @@ msgid "Remove calendar" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:311 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:246 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:630 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:255 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:638 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:506 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:138 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1304 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java:222 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:720 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1498 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1662 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1328 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java:228 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:655 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1525 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1689 msgid "must be lower than finish date" msgstr "" #: 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:743 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:758 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:160 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:78 @@ -4440,7 +4476,7 @@ msgstr "" msgid "Time filter" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:58 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:59 msgid "Move selected task up" msgstr "" @@ -4532,7 +4568,10 @@ msgstr "" msgid "Task quality form name" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1078 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1079 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:155 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:160 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:180 msgid "Some cost category assignments overlap in time" msgstr "" @@ -4625,7 +4664,7 @@ msgstr "" #: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:90 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:75 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:213 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:212 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:37 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:41 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:171 @@ -4648,10 +4687,6 @@ msgstr "" msgid "Filter" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:200 -msgid "Choose a task to operate on it" -msgstr "" - #: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:25 msgid "Assigned locations" msgstr "" @@ -4660,7 +4695,9 @@ msgstr "" msgid "Unit type saved" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:169 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:266 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:128 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:137 msgid "Two hour costs with the same type overlap in time" msgstr "" @@ -4689,7 +4726,7 @@ msgstr "" msgid "generic machines allocation" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:307 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:310 msgid "Schedule from the deadline to start" msgstr "" @@ -4714,14 +4751,14 @@ msgid "Administration" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:292 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:229 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:613 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:238 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:621 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:489 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1287 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java:205 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:702 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1481 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1644 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1311 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java:211 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:637 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1508 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1671 msgid "must be greater than start date" msgstr "" @@ -4751,8 +4788,8 @@ msgstr "" msgid "worked hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:758 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:139 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:771 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:143 msgid "cannot include a progress of the same progress type twice" msgstr "" @@ -4805,7 +4842,7 @@ msgstr "" msgid "Removed calendar \"{0}\"" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1041 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1065 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:23 msgid "Create project" msgstr "" @@ -4819,7 +4856,7 @@ msgid "" "Allow multiple values of this type of criterion in the same period of time" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1295 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1299 msgid "" "The date is not valid, the date must be unique for this progress assignment" msgstr "" @@ -4851,7 +4888,7 @@ msgstr "" msgid "New work report" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:836 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:844 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:662 msgid "yes" msgstr "" @@ -4877,7 +4914,7 @@ msgstr "" msgid "This resource has already been added." msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:128 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:129 msgid "Calendar exception types" msgstr "" @@ -4909,11 +4946,11 @@ msgstr "" msgid "Select required criteria set and press filter button" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:229 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:302 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:714 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:238 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:311 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:731 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:114 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java:141 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java:147 #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:310 #: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:228 #: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:230 @@ -5039,7 +5076,7 @@ msgstr "" msgid "Workable Time" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:54 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:55 msgid "Move selected task down" msgstr "" @@ -5047,9 +5084,9 @@ msgstr "" msgid "Customer Reference" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:763 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:129 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:142 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:776 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:133 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:146 msgid "spread values are not valid, at least one value should be true" msgstr "" @@ -5065,23 +5102,12 @@ msgstr "" msgid "SV" msgstr "" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:83 -msgid "Our company login" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1433 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1460 msgid "Filter work reports" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:842 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:274 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:857 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:651 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:62 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:48 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:45 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:48 -msgid "Progress" +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:83 +msgid "Our company login" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:369 @@ -5090,13 +5116,24 @@ msgid "" "the Configuration window before." msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:842 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:274 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:863 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:586 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:62 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:48 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:45 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:48 +msgid "Progress" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:127 msgid "" "This criterion type cannot be deleted because it has assignments to projects " "or resources" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1216 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1220 msgid "All progress types have already been assigned." msgstr "" @@ -5189,11 +5226,11 @@ msgstr "" #: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:41 #: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:223 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:224 msgid "Active" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1253 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1257 msgid "This progress measurement can not be in " msgstr "" @@ -5201,19 +5238,19 @@ msgstr "" msgid "Inherited labels" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1238 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1242 msgid "" "This progress can not be changed or removed, because it has got consolidated " "progress. It is needed to remove the consolidation on all its progress." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:904 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:909 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:289 msgid "Unindent" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:927 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1385 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:931 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1389 msgid "Value is not valid, the current value must be not empty" msgstr "" @@ -5274,7 +5311,7 @@ msgstr "" msgid "This template can not be removed because it has applications." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:465 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:482 msgid "The code sequence is already in use and it can not be updated." msgstr "" @@ -5294,7 +5331,7 @@ msgstr "" msgid "Number of iterations should be between 1 and " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:122 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:125 msgid "Scenarios must be enabled as more elements than master exist" msgstr "" @@ -5320,7 +5357,7 @@ msgstr "" msgid "Assignation" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:143 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:144 msgid "Planning charts expanded" msgstr "" @@ -5349,7 +5386,7 @@ msgstr "" msgid "Criterion Type List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:600 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:599 msgid "Overall progress" msgstr "" @@ -5371,7 +5408,7 @@ msgstr "" msgid "Observations" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:931 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:944 msgid "Edit project" msgstr "" @@ -5396,7 +5433,7 @@ msgstr "" msgid "exception date already exists" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:301 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:303 msgid "There exists other template with the same name." msgstr "" @@ -5425,9 +5462,9 @@ msgstr "" #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:82 #: 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/order.zul:69 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:132 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:167 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:68 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:131 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:166 #: navalplanner-webapp/src/main/webapp/common/layout/template.zul:89 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:79 msgid "Accept" @@ -5437,8 +5474,8 @@ msgstr "" msgid "Example: {0}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:271 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:291 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:279 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:299 #: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:39 msgid "Edit Worker" msgstr "" @@ -5448,7 +5485,7 @@ msgid "" "Create new material assignment out of material assignment {0}. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:193 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:192 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:151 msgid "Work report lines" msgstr "" @@ -5465,7 +5502,7 @@ msgstr "" msgid "Completed: {0}% " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1173 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1177 msgid "Calculated progress measurement can not be removed" msgstr "" @@ -5486,6 +5523,7 @@ msgstr "" #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:114 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160 +#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:44 msgid "Click on " msgstr "" @@ -5528,7 +5566,7 @@ msgstr "" #: 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:30 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:800 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:815 #: 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 @@ -5602,7 +5640,7 @@ msgstr "" msgid "Update exception" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:251 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/TreeElementOperationsController.java:253 msgid "Operation cannot be done" msgstr "" @@ -5665,7 +5703,7 @@ msgstr "" msgid "Date cannot be null" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:751 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:766 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:68 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:49 #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:168 @@ -5674,7 +5712,7 @@ msgstr "" msgid "Task Code" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:156 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:157 msgid "Project view" msgstr "" @@ -5697,14 +5735,14 @@ msgstr "" msgid "New criterion" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:598 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:597 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:348 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:541 #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:48 msgid "Load" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:862 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:868 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:31 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:59 #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:35 @@ -5740,7 +5778,7 @@ msgstr "" msgid "already exists an allocation for criteria {0}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:305 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:307 msgid "Forward" msgstr "" @@ -5758,16 +5796,16 @@ msgstr "" msgid "Unnasigned" 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/common/layout/login.zul:69 #: 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/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:256 msgid "Virtual worker" msgstr "" @@ -5817,6 +5855,10 @@ msgstr "" msgid "Starting date" msgstr "" +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:33 +msgid "Load 100%" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:979 msgid "Function" msgstr "" @@ -5829,11 +5871,12 @@ msgstr "" #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:92 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:141 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:139 +#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:25 msgid "Format" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:542 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:579 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:585 msgid "New project version" msgstr "" @@ -5842,10 +5885,10 @@ msgid "Edit Unit Type" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:473 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:71 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:81 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:530 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1207 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:536 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1231 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:471 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:306 #: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:34 #: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:36 @@ -5858,7 +5901,7 @@ msgstr "" #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:32 #: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:39 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:36 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:40 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:41 #: 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 @@ -5888,7 +5931,7 @@ msgstr "" msgid "New Description" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1155 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1136 msgid "" "resources cost category assignment codes must be unique inside a resource" msgstr "" @@ -5931,7 +5974,7 @@ msgstr "" msgid "Reassigning" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:510 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:519 msgid "" "Cannot delete that cost category because there are resources assigned to it." msgstr "" @@ -6013,8 +6056,8 @@ msgstr "" msgid "BCWS" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1283 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1305 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1287 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1309 msgid "" "Value is not valid, the value must be greater than the value of the previous " "progress." @@ -6024,11 +6067,11 @@ msgstr "" msgid " in the specified directory." msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1149 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1130 msgid "criterion satisfaction codes must be unique inside a resource" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:836 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:844 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:662 msgid "no" msgstr "" @@ -6041,11 +6084,11 @@ msgstr "" #: 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/OrderFilterEnum.java:29 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:28 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:84 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:85 msgid "Criterion" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:75 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:76 msgid "Generate code for" msgstr "" @@ -6071,7 +6114,7 @@ msgstr "" msgid "Average of the worked hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:470 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:405 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" @@ -6082,12 +6125,12 @@ msgstr "" msgid "an authorization type must be set" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:82 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:91 msgid "Must start after (days since beginning project)" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:541 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:578 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:584 msgid "" "Confirm creating a new project version for this scenario and derived. Are " "you sure?" @@ -6165,8 +6208,8 @@ msgstr "" msgid "Label type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:212 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:282 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:228 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:298 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:242 msgid "Advanced Allocation" msgstr "" @@ -6206,15 +6249,15 @@ msgstr "" msgid "Status" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:162 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:163 msgid "Resource load view" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:973 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:92 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:81 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:61 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:69 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:792 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:807 #: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:68 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:75 @@ -6230,7 +6273,7 @@ msgstr "" msgid "Hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:631 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:630 msgid "the date must be inside the visualization area" msgstr "" @@ -6264,7 +6307,7 @@ msgstr "" msgid "Limiting Resources Planning" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:765 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:769 msgid "The max value must be not empty" msgstr "" @@ -6294,7 +6337,7 @@ msgstr "" msgid "Scenario \"{0}\" saved" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:215 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:214 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:173 msgid "Save & New work report" msgstr "" @@ -6303,7 +6346,7 @@ msgstr "" msgid "Subcontract price" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:149 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:147 msgid "" "Some entity sequence was created during the configuration process, it is " "impossible to update entity sequence table. Please, try again later" @@ -6313,16 +6356,16 @@ msgstr "" msgid "Resources per day are zero" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:52 -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/machine/_machineCriterions.zul:23 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:29 msgid "Assigned criteria" msgstr "" +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:52 +msgid "Help on authentication (opens a new window)" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:869 msgid "The length must be greater than 0, and not null." msgstr "" @@ -6364,6 +6407,7 @@ msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:322 #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:355 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:175 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:199 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:344 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:372 @@ -6378,7 +6422,7 @@ msgstr "" #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:42 #: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:50 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:48 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:49 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:54 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:55 #: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:31 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:57 @@ -6389,8 +6433,8 @@ msgstr "" msgid "Create" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1678 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1684 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1705 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1711 msgid "please, select a work report type" msgstr "" @@ -6408,29 +6452,29 @@ msgstr "" msgid "Total price" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:942 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:948 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:947 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:953 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:381 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:711 #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:179 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:137 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:321 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:792 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:800 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:619 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:231 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:284 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:452 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:466 -#: 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/orders/OrderCRUDController.java:1223 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1199 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:293 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:461 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:475 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:142 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:162 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1247 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1203 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:199 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:331 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:404 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:387 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1180 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1192 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1207 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1219 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:435 #: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:203 #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:270 @@ -6470,6 +6514,7 @@ msgstr "" #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:110 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:41 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:46 #: 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 @@ -6486,33 +6531,33 @@ msgstr "" msgid "Delete" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:97 +#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:98 msgid "There are no days available due to not satisfying the criterions." msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:98 +#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:99 msgid "" "Another possibility is that the resources don't have days available due to " "their calendars." msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:104 +#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:105 msgid "" "There are no days available in the days marked available by the task " "calendar." msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:105 +#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:106 msgid "Maybe the criterions are not satisfied in those days." msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:169 +#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:170 msgid "" "The resource's calendar has no available days starting from the start of the " "task." msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:174 +#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:175 msgid "" "There are no days available at resource's calendar in the days marked " "available by the task's calendar." @@ -6639,6 +6684,18 @@ msgstr "" msgid "[generic all machines]" msgstr "" +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:106 +msgid "Hours cost type cannot be empty or null" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:115 +msgid "Init date cannot be empty or null" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:120 +msgid "End date cannot be empty or null" +msgstr "" + #: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ProgressType.java:35 msgid "Progress with all task tasks by hours" msgstr "" @@ -6665,7 +6722,7 @@ msgstr "" msgid "You can not remove this order sequence, it is already in use" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java:891 +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java:893 #: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:653 msgid "Cannot spread two progress in the same task" msgstr "" @@ -6742,12 +6799,12 @@ msgid "" msgstr "" #: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:677 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:704 +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:703 msgid "Duplicate Progress Assignment For Task" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:1328 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:1338 +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:1336 +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:1346 #, java-format msgid "Repeated Project code {0} in Project {1}" msgstr ""