From 9dd68dadc467424ccfb6683847b53b4368deab05 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Wed, 11 Apr 2012 08:34:29 +0200 Subject: [PATCH] i18n: Update keys.pot files FEA: ItEr76S03Community --- ganttzk/src/main/resources/i18n/keys.pot | 42 +- .../src/main/resources/i18n/keys.pot | 559 ++++++++++-------- 2 files changed, 334 insertions(+), 267 deletions(-) diff --git a/ganttzk/src/main/resources/i18n/keys.pot b/ganttzk/src/main/resources/i18n/keys.pot index f0bff0848..1a555cf52 100644 --- a/ganttzk/src/main/resources/i18n/keys.pot +++ b/ganttzk/src/main/resources/i18n/keys.pot @@ -7,9 +7,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 1.2.2\n" +"Project-Id-Version: libreplan-1.2.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-24 09:08+0100\n" +"POT-Creation-Date: 2012-04-11 08:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -31,11 +31,15 @@ msgstr "" msgid "Worker" msgstr "" +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:682 +msgid "Show money cost bar" +msgstr "" + #: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:29 msgid "Start" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:635 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:661 msgid "Show reported hours" msgstr "" @@ -84,6 +88,10 @@ msgstr "" msgid "Criterion" msgstr "" +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:688 +msgid "Hide money cost bar" +msgstr "" + #: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:44 msgid "Print" msgstr "" @@ -112,6 +120,10 @@ msgstr "" msgid "changing zoom" msgstr "" +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:91 +msgid "Show/Hide money cost bar" +msgstr "" + #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:45 msgid "Quarter" msgstr "" @@ -137,7 +149,7 @@ msgstr "" msgid "Name filter" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:615 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:641 msgid "Show progress" msgstr "" @@ -149,14 +161,14 @@ msgstr "" msgid "Show/Hide critical path" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:32 -msgid "Year" -msgstr "" - #: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:150 msgid "showing criteria" msgstr "" +#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:32 +msgid "Year" +msgstr "" + #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:58 msgid "Month" msgstr "" @@ -169,11 +181,11 @@ msgstr "" msgid "Set End-Start" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:297 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:308 msgid "decreasing zoom" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:596 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:622 msgid "Hide critical path" msgstr "" @@ -181,7 +193,7 @@ msgstr "" msgid "Day" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:642 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:668 msgid "Hide reported hours" msgstr "" @@ -202,7 +214,7 @@ msgid "Hour" msgstr "" #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:90 -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:114 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:120 msgid "Graphics" msgstr "" @@ -214,7 +226,7 @@ msgstr "" msgid "See resource allocation" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:280 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:291 msgid "increasing zoom" msgstr "" @@ -230,10 +242,10 @@ msgstr "" msgid "Refresh" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:591 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:617 msgid "Show critical path" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:620 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:646 msgid "Hide progress" msgstr "" diff --git a/libreplan-webapp/src/main/resources/i18n/keys.pot b/libreplan-webapp/src/main/resources/i18n/keys.pot index 2616c15e4..d2d466d9d 100644 --- a/libreplan-webapp/src/main/resources/i18n/keys.pot +++ b/libreplan-webapp/src/main/resources/i18n/keys.pot @@ -7,9 +7,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 1.2.2\n" +"Project-Id-Version: libreplan-1.2.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-24 09:08+0100\n" +"POT-Creation-Date: 2012-04-11 08:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -148,7 +148,7 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 #: libreplan-webapp/src/main/webapp/materials/materials.zul:33 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:66 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:67 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:54 @@ -157,7 +157,7 @@ msgstr "" msgid "Materials" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:361 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:357 msgid "Reassign" msgstr "" @@ -198,7 +198,7 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:344 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:67 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:68 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53 msgid "Quality Forms" msgstr "" @@ -207,11 +207,15 @@ msgstr "" msgid "Reports" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:117 +msgid "Create task" +msgstr "" + #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:22 msgid "LibrePlan: Advanced allocation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:172 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:177 msgid "The {0} sequence prefixes can not be repeated" msgstr "" @@ -298,7 +302,7 @@ msgid "generic workers allocation" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:310 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:895 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 msgid "The project has no scheduled elements" msgstr "" @@ -376,17 +380,17 @@ msgstr "" msgid "Project Name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:967 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1084 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306 msgid "Indent" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:327 -msgid "Save passwords in database" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:252 +msgid "Reassignation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:256 -msgid "Reassignation" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:327 +msgid "Save passwords in database" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:42 @@ -457,7 +461,7 @@ msgid "" "applicable to this resource" msgstr "" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:65 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:66 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:52 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:50 msgid "Criterion Requirement" @@ -592,7 +596,7 @@ msgstr "" msgid "First name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java:256 +#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java:250 msgid "Could not execute print command" msgstr "" @@ -605,7 +609,7 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:452 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:832 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:836 msgid "Confirm deleting {0}. Are you sure?" msgstr "" @@ -732,7 +736,7 @@ msgstr "" msgid "The task code cannot be null" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:594 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:596 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:329 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 @@ -809,7 +813,7 @@ msgstr "" msgid "{0} annotation required on {1}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1067 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1193 msgid "Modified" msgstr "" @@ -874,7 +878,7 @@ msgstr "" msgid "Work done from starting date" msgstr "" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:69 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:70 msgid "Statistics log" msgstr "" @@ -883,7 +887,7 @@ msgstr "" msgid "Edit Calendar" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:112 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:117 msgid "Profile" msgstr "" @@ -906,7 +910,7 @@ msgstr "" msgid "{0} \"{1}\" saved" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:299 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:301 msgid "filtering" msgstr "" @@ -963,6 +967,12 @@ msgstr "" msgid "add" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:860 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:111 +#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:69 +msgid "Budget value cannot be negative" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:239 msgid "Unsaved changes will be lost. Would you like to continue?" msgstr "" @@ -1040,8 +1050,8 @@ msgstr "" msgid "Exception end date should be greater or equals than start date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:476 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:486 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:474 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:484 msgid "Repeated Project code {0} in Project {1}" msgstr "" @@ -1071,7 +1081,7 @@ msgstr "" msgid "Type data" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:117 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:122 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 msgid "Profiles" msgstr "" @@ -1216,13 +1226,13 @@ msgstr "" msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:958 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:236 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:690 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:581 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1039 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:240 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:696 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:583 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:68 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:64 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:65 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:50 msgid "Labels" @@ -1232,7 +1242,7 @@ msgstr "" msgid "Data Types" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:157 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:161 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68 msgid "Total hours" msgstr "" @@ -1249,8 +1259,8 @@ msgstr "" msgid "Filter by task status" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:528 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:419 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:529 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:416 msgid "Select date" msgstr "" @@ -1267,19 +1277,23 @@ msgstr "" msgid "Company code" msgstr "" +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:62 +msgid "Sum of imputed hours in children tasks" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/TwoWaySelector.java:110 msgid "Unknown attribute '{0}' in class {1}" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:96 +msgid "passwords can not be empty" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:699 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:33 msgid "NON LIMITING RESOURCE" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:96 -msgid "passwords can not be empty" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:88 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:128 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:176 @@ -1428,11 +1442,15 @@ msgstr "" msgid "Enable scenarios module" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:312 +msgid "to {0}" +msgstr "" + #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:59 msgid "Zoom" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:865 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:863 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112 #: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91 @@ -1448,9 +1466,9 @@ msgstr "" #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:131 #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:81 #: libreplan-webapp/src/main/webapp/settings/settings.zul:124 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:81 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:162 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:135 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:70 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:151 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:143 #: libreplan-webapp/src/main/webapp/calendars/calendars.zul:44 #: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:40 #: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:41 @@ -1509,7 +1527,7 @@ msgstr "" msgid "Entity type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1101 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1127 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:268 msgid "Unsaved changes will be lost. Are you sure?" msgstr "" @@ -1550,13 +1568,13 @@ msgstr "" msgid "ResourceType must be not-null" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:95 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:105 msgid "" "Estimated end date for the task (press enter in textbox to open calendar " "popup or type in date directly)" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:292 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:293 msgid "Expand/Collapse all" msgstr "" @@ -1564,11 +1582,11 @@ msgstr "" msgid "Overload due to current project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:946 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1017 msgid "Name: {0}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:903 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1020 msgid "Move down" msgstr "" @@ -1615,7 +1633,7 @@ msgstr "" msgid "missing code in a criterion" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1278 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1282 msgid "Create Template" msgstr "" @@ -1632,7 +1650,7 @@ msgstr "" msgid "Filter by labels" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:577 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:586 msgid "" "IMPORTANT: Don't forget to communicate to subcontractor that his contract " "has been cancelled" @@ -1663,10 +1681,10 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:103 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:391 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:509 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:547 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:578 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:148 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:518 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:556 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:587 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:153 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:476 msgid "Warning" msgstr "" @@ -1783,8 +1801,8 @@ msgstr "" msgid "Add From Template" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:508 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:546 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:517 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:555 msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "" @@ -1819,7 +1837,7 @@ msgstr "" msgid "Enable LDAP authentication" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:493 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:490 msgid "( max: {0} )" msgstr "" @@ -1840,7 +1858,7 @@ msgid "Cannot calculate charts for current data" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:176 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1495 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1499 msgid "project name already being used" msgstr "" @@ -1857,7 +1875,7 @@ msgstr "" msgid "You can not remove the default scenario called \"{0}\"" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:522 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:519 msgid "There are not any assigned progress to current task" msgstr "" @@ -1886,7 +1904,7 @@ msgstr "" msgid "Label" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:870 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:987 msgid "Value is not valid, taking into account the current list of HoursGroup" msgstr "" @@ -1903,8 +1921,8 @@ msgstr "" msgid "Quality forms" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:499 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:509 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:497 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:507 msgid "Repeated Hours Group code {0} in Project {1}" msgstr "" @@ -1916,7 +1934,7 @@ msgstr "" msgid "LibrePlan: Accounts" msgstr "" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:96 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:97 #: libreplan-webapp/src/main/webapp/templates/_list.zul:30 msgid "Days from Beginning to Deadline" msgstr "" @@ -1949,7 +1967,7 @@ msgstr "" msgid "Pessimistic" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:376 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:385 msgid "Limiting resource assignation" msgstr "" @@ -1980,7 +1998,7 @@ msgstr "" msgid "Entity sequences" msgstr "" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:91 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:92 #: libreplan-webapp/src/main/webapp/templates/_list.zul:28 msgid "Delay from beginning (days)" msgstr "" @@ -2010,7 +2028,7 @@ msgstr "" msgid "Work And Progress Per Task" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1519 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1523 msgid "project code already being used" msgstr "" @@ -2029,8 +2047,8 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:457 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:208 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:264 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:840 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:875 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:844 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:879 msgid "Error on showing removing element: " msgstr "" @@ -2091,7 +2109,7 @@ msgid "Overload" msgstr "" #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:30 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:68 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:69 msgid "Assignment log" msgstr "" @@ -2100,10 +2118,6 @@ msgstr "" msgid "Work Report Models" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyCaptTimeout.java:45 -msgid "CutycaptTimeout thread exception" -msgstr "" - #: libreplan-webapp/src/main/webapp/materials/materials.zul:73 msgid "New" msgstr "" @@ -2112,7 +2126,7 @@ msgstr "" msgid "Date last progress measurement" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:103 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:112 msgid "Deadline (days since beggining project)" msgstr "" @@ -2142,12 +2156,12 @@ msgstr "" msgid "Task code cannot be null" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:520 -msgid "It is not allowed to consolidate progress." +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:302 +msgid "Derived of calendar {0}" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32 -msgid "Create Task" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:517 +msgid "It is not allowed to consolidate progress." msgstr "" #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27 @@ -2158,10 +2172,10 @@ msgstr "" #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:60 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:61 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:27 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:107 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:140 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:108 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:129 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68 msgid "Actions" @@ -2234,11 +2248,15 @@ msgstr "" msgid "Hours Group" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1029 +msgid "Budget: {0}€, Consumed: {1}€ ({2}%)" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:825 msgid "Unallocated name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:924 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1041 msgid "Move up" msgstr "" @@ -2252,7 +2270,7 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:131 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:134 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:281 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:301 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:269 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:367 msgid "Scheduling" @@ -2288,17 +2306,17 @@ msgstr "" msgid "Create new project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:954 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1026 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:161 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:165 #: libreplan-webapp/src/main/webapp/orders/_list.zul:35 msgid "State" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:80 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:90 msgid "Must start after" msgstr "" @@ -2306,7 +2324,7 @@ msgstr "" msgid "Confirm change" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:845 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:849 msgid "You don't have permissions to edit this project" msgstr "" @@ -2345,7 +2363,7 @@ msgstr "" msgid "New task" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:191 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:197 msgid "The password for a new user cannot be empty" msgstr "" @@ -2397,7 +2415,7 @@ msgstr "" msgid "Workers List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:355 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:375 msgid "Delete project template. Are you sure?" msgstr "" @@ -2478,18 +2496,18 @@ msgstr "" msgid "Tasks input buffer" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:168 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:173 msgid "At least one {0} sequence must be active" msgstr "" #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:26 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:139 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 msgid "Profile name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java:252 +#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java:246 msgid "Could open generated PDF" msgstr "" @@ -2501,7 +2519,7 @@ msgstr "" msgid "You should select a source scenario" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:163 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:168 msgid "At least one {0} sequence is needed" msgstr "" @@ -2536,17 +2554,17 @@ msgid "" "to generate usage statistics" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:36 -msgid "More options" +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesModel.java:219 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java:179 +msgid "Error: {0}" msgstr "" #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 msgid "Communication" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesModel.java:219 -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java:179 -msgid "Error: {0}" +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:36 +msgid "More options" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:240 @@ -2579,7 +2597,7 @@ msgstr "" msgid "Projects" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1102 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1128 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:269 msgid "Confirm exit dialog" msgstr "" @@ -2657,7 +2675,7 @@ msgstr "" msgid "Output format" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:47 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:49 msgid "Print" msgstr "" @@ -2677,8 +2695,8 @@ msgstr "" msgid "Effort cannot be null" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1093 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:52 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1119 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:126 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106 @@ -2690,16 +2708,16 @@ msgstr "" #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:80 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:137 -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:48 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:50 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:81 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:50 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:91 #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42 #: libreplan-webapp/src/main/webapp/planner/order.zul:131 #: libreplan-webapp/src/main/webapp/planner/order.zul:166 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:85 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:166 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:139 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:74 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:147 #: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:58 #: libreplan-webapp/src/main/webapp/calendars/calendars.zul:47 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:103 @@ -2735,8 +2753,8 @@ msgid "Machines List" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:320 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:692 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:904 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:696 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:908 msgid "You don't have read access to this project" msgstr "" @@ -2812,7 +2830,7 @@ msgstr "" msgid "Cost Category" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:471 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:473 msgid "end" msgstr "" @@ -2833,7 +2851,7 @@ msgstr "" msgid "Continue" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementController.java:121 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementController.java:122 msgid "Edit task {0}" msgstr "" @@ -2866,7 +2884,7 @@ msgstr "" msgid "Add criterion requirement" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:860 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:864 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 " @@ -2906,7 +2924,7 @@ msgstr "" msgid "please, select a label" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:134 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:123 msgid "Add profile" msgstr "" @@ -2985,8 +3003,8 @@ msgstr "" msgid "Disabled" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:738 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:325 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:764 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:322 msgid "Earned value" msgstr "" @@ -3016,8 +3034,8 @@ msgid "" "Please save your project before proceeding." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1163 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1178 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1243 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1258 msgid "{0} not supported yet" msgstr "" @@ -3039,7 +3057,7 @@ msgstr "" msgid "Resources Load" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:220 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:225 msgid "Some sequences to remove not existed" msgstr "" @@ -3114,11 +3132,11 @@ msgid "Select start date" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:106 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:152 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:157 msgid "Error on showing warning message removing typeOfWorkHours: " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:882 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:886 msgid "Removed {0}" msgstr "" @@ -3130,8 +3148,8 @@ msgstr "" msgid "Group name" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:59 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:106 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:60 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:107 msgid "Role name" msgstr "" @@ -3147,8 +3165,8 @@ msgstr "" msgid "Value is not valid, the precision value must not be empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:863 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:473 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:889 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:470 msgid "h" msgstr "" @@ -3173,7 +3191,7 @@ msgstr "" msgid "Assign selected items" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:450 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:452 msgid "init" msgstr "" @@ -3250,6 +3268,10 @@ msgstr "" msgid "Hours type" msgstr "" +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:43 +msgid "Show money cost bar" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:156 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:211 msgid "criterion type name not specified" @@ -3263,11 +3285,11 @@ msgstr "" msgid "Add Exception" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:220 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:222 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:202 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:223 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:247 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:378 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:379 msgid "cannot be empty" msgstr "" @@ -3391,7 +3413,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:145 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:94 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:40 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:80 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:81 #: libreplan-webapp/src/main/webapp/templates/_list.zul:27 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:45 @@ -3460,7 +3482,7 @@ msgstr "" msgid "The end date cannot be before the init date" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:117 msgid "" "Profiles of LDAP users cannot be managed because LDAP roles are being used." msgstr "" @@ -3556,7 +3578,7 @@ msgstr "" msgid "Changes saved" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1263 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1267 msgid "See scheduling" msgstr "" @@ -3585,7 +3607,7 @@ msgid "Work report saved" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractCommand.java:53 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:377 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:386 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:68 msgid "Subcontract" msgstr "" @@ -3621,10 +3643,6 @@ msgstr "" msgid "April" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:302 -msgid "Derived of Calendar " -msgstr "" - #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:22 msgid "Users List" msgstr "" @@ -3682,14 +3700,14 @@ msgstr "" msgid "Unindent selected task" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:62 -msgid "Constraint" -msgstr "" - #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 msgid "Customer reference code" msgstr "" +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:66 +msgid "Constraint" +msgstr "" + #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150 msgid "Add New Label Type Field" msgstr "" @@ -3708,16 +3726,16 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:146 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:311 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:321 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:693 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:846 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:896 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:905 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:932 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:697 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:850 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:900 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:909 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:936 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 msgid "Information" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:931 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:935 msgid "Sorry, you do not have permissions to access this project" msgstr "" @@ -3741,7 +3759,7 @@ msgstr "" msgid "Assign element to queue manually" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:47 msgid "Please remember that only saved changes will be printed" msgstr "" @@ -3786,6 +3804,10 @@ msgstr "" msgid "Unable to convert value to {0} type" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:81 +msgid "Total task budget" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:222 msgid "Worker must be not-null" msgstr "" @@ -3794,14 +3816,14 @@ msgstr "" msgid "Some criterion satisfactions overlap in time" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 -msgid "LibrePlan: Materials Needs At Date" -msgstr "" - #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:49 msgid "Value last progress measurement" msgstr "" +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 +msgid "LibrePlan: Materials Needs At Date" +msgstr "" + #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44 msgid "Worker assignments" msgstr "" @@ -4030,7 +4052,7 @@ msgid "Check consolidated progresses" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1469 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:585 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:587 msgid "Show all" msgstr "" @@ -4048,7 +4070,7 @@ msgid "Apply tab changes" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:99 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:170 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:176 msgid "passwords don't match" msgstr "" @@ -4168,7 +4190,7 @@ msgstr "" msgid "List of materials for all categories (select one to filter)" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:69 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:73 msgid "Resource allocation type" msgstr "" @@ -4185,7 +4207,7 @@ msgstr "" msgid "In the available periods {0} only {1} hours are available." msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:126 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:115 msgid "Association with profiles" msgstr "" @@ -4227,7 +4249,7 @@ msgstr "" msgid "Total dedication" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:683 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:686 msgid "" "You can not remove the task \"{0}\" because of this or any of its children " "are already in use in some work reports" @@ -4428,8 +4450,8 @@ msgstr "" msgid "Select type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:950 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:679 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1021 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:685 msgid "Hours invested" msgstr "" @@ -4499,7 +4521,7 @@ msgstr "" msgid "Both" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:765 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:882 msgid "Not editable for containing more that an hours group." msgstr "" @@ -4573,6 +4595,7 @@ msgid "LibrePlan: Transfer Projects Between Scenarios" msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:118 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:166 msgid "%" msgstr "" @@ -4583,14 +4606,14 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1536 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1700 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:336 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:273 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:338 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:274 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:141 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:633 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:425 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:257 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:670 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1328 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:673 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1332 msgid "must be lower than finish date" msgstr "" @@ -4611,14 +4634,14 @@ msgstr "" msgid "Total task hours" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/RedirectorSynthetiser.java:125 -msgid "Could not load any resource" -msgstr "" - #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:46 msgid "Date last progress reported" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/RedirectorSynthetiser.java:125 +msgid "Could not load any resource" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:37 msgid "Work And Progress Per Project" @@ -4681,7 +4704,7 @@ msgstr "" msgid "Unit type code cannot be empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:183 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:189 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 msgid "Users" msgstr "" @@ -4714,8 +4737,8 @@ msgid "" "completed." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:218 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:232 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:223 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:244 msgid "Template saved" msgstr "" @@ -4754,7 +4777,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:31 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:53 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:67 -#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineGroupTemplate.java:243 +#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineGroupTemplate.java:244 msgid "Group" msgstr "" @@ -4819,9 +4842,9 @@ msgstr "" #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:78 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:134 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:83 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:164 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:137 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:72 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:145 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:114 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:100 #: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:92 @@ -4889,7 +4912,7 @@ msgstr "" msgid "generic machines allocation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:375 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:384 msgid "Non limiting resource assignation" msgstr "" @@ -4912,13 +4935,13 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1519 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1682 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:317 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:255 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:319 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:256 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:616 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:240 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:652 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1311 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:655 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1315 msgid "must be greater than start date" msgstr "" @@ -4931,6 +4954,10 @@ msgstr "" msgid "Assign quality form" msgstr "" +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:157 +msgid "Calculated budget" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:387 msgid "Delete item {0}. Are you sure?" msgstr "" @@ -4956,6 +4983,10 @@ msgstr "" msgid "Allocations" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:137 +msgid "Choosing Template" +msgstr "" + #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:66 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 msgid "Capacity" @@ -5000,7 +5031,7 @@ msgstr "" msgid "Removed calendar \"{0}\"" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1068 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1072 msgid "Create project" msgstr "" @@ -5041,29 +5072,29 @@ msgstr "" msgid "New work report" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:305 +msgid "Root calendar" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:847 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578 msgid "yes" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:305 -msgid "Root calendar" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:867 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:871 msgid "" "Deleting this subcontracted project, you are going to lose the relation to " "report progress. Are you sure?" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:278 -msgid "Port" -msgstr "" - #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:113 msgid "Select gap" msgstr "" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:278 +msgid "Port" +msgstr "" + #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:63 msgid "Date Finish" msgstr "" @@ -5091,7 +5122,11 @@ msgstr "" msgid "missing code in a hour cost" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:902 +#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:247 +msgid "Exception Day Type" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:973 msgid "All workers" msgstr "" @@ -5115,14 +5150,16 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:311 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:207 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:307 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:110 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:130 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:994 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1184 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1441 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:135 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:171 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:115 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1488 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1512 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1492 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1516 #: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:757 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:45 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:53 @@ -5189,10 +5226,6 @@ msgstr "" msgid "Load due to other assignments" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:62 -msgid "Sum of all task leafs imputed hours" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:554 msgid "This machine was already removed by other user" msgstr "" @@ -5265,11 +5298,11 @@ msgstr "" msgid "Filter work reports" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:947 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:678 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:601 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1018 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:684 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:603 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:328 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:63 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:64 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:48 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:46 @@ -5332,7 +5365,7 @@ msgstr "" msgid "LibrePlan: Work Reports" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:373 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:393 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:393 msgid "Error on showing delete confirm" msgstr "" @@ -5357,7 +5390,7 @@ msgstr "" msgid "Finish hour" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:200 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:196 msgid "Done {0} of {1}" msgstr "" @@ -5413,16 +5446,16 @@ msgstr "" msgid "Inherited labels" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:946 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 -msgid "Unindent" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:939 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1406 msgid "Value is not valid, the current value must be not empty" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1063 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 +msgid "Unindent" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:50 msgid "Direct labels" msgstr "" @@ -5486,7 +5519,7 @@ msgstr "" msgid "Scheduling state" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:369 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:389 msgid "This template can not be removed because it has applications." msgstr "" @@ -5506,6 +5539,10 @@ msgstr "" msgid "Number of iterations should be between 1 and " msgstr "" +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:151 +msgid "Budget in money" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:145 msgid "Scenarios must be enabled as more elements than master exist" msgstr "" @@ -5548,7 +5585,7 @@ msgstr "" msgid "Administrator" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:190 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:186 msgid "Doing {0} reassignations" msgstr "" @@ -5584,7 +5621,7 @@ msgstr "" msgid "Criterion Type List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:739 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:765 msgid "Overall progress" msgstr "" @@ -5608,7 +5645,7 @@ msgstr "" msgid "Observations" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:947 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:951 msgid "Edit project" msgstr "" @@ -5663,7 +5700,6 @@ msgstr "" msgid "Only {0} resources per day were achieved for current allocation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:51 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:79 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:48 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:89 @@ -5710,6 +5746,10 @@ msgstr "" msgid "Calculated progress measurement can not be removed" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:252 +msgid "Exception Day Types" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java:335 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java:341 msgid " The " @@ -5753,6 +5793,10 @@ msgstr "" msgid "Infinitely Over Assignable" msgstr "" +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:157 +msgid "Money spent" +msgstr "" + #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:426 msgid "criterion names must be unique inside a criterion type" msgstr "" @@ -5788,7 +5832,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:86 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:116 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:95 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:85 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:86 #: libreplan-webapp/src/main/webapp/templates/_list.zul:26 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:54 @@ -5845,15 +5889,20 @@ msgstr "" msgid "Update exception" msgstr "" -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 -msgid "Budget" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:253 msgid "Operation cannot be done" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:91 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:80 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:62 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:107 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 +#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:65 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 +msgid "Budget" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "May" msgstr "" @@ -5887,7 +5936,7 @@ msgstr "" msgid "Assign element to queue automatically" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:82 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:92 msgid "" "Date which the task must start after (press enter in textbox to open " "calendar popup or type in date directly)" @@ -5923,8 +5972,8 @@ msgstr "" msgid "Probability %" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:737 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:324 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:763 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:321 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:815 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49 msgid "Load" @@ -5935,12 +5984,12 @@ msgstr "" msgid "New criterion" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:683 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:689 #: libreplan-webapp/src/main/webapp/materials/materials.zul:81 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:43 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:49 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:101 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:102 #: libreplan-webapp/src/main/webapp/templates/_list.zul:32 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 @@ -5964,7 +6013,7 @@ msgstr "" msgid "already exists an allocation for criteria {0}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:283 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:303 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:294 msgid "Project Templates" msgstr "" @@ -5991,7 +6040,7 @@ msgstr "" msgid "At least one HoursGroup is needed" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:178 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:184 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:74 #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:165 @@ -6055,8 +6104,8 @@ msgstr "" msgid "Function" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:799 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:363 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:825 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:360 msgid "date in future" msgstr "" @@ -6071,14 +6120,14 @@ msgstr "" msgid "Format" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:887 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:885 msgid "New project version" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:77 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:79 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:366 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:484 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1231 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:486 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1235 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478 #: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:537 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:37 @@ -6249,7 +6298,7 @@ msgstr "" msgid "BCWS" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java:351 +#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java:343 msgid " in the specified directory." msgstr "" @@ -6302,7 +6351,7 @@ msgstr "" msgid "Create project from Template" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:418 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:420 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" @@ -6313,11 +6362,15 @@ msgstr "" msgid "an authorization type must be set" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:92 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:101 msgid "Must start after (days since beginning project)" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:886 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:134 +msgid "Percentage of estimated budget in money / money spent" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:884 msgid "" "Confirm creating a new project version for this scenario and derived. Are " "you sure?" @@ -6365,7 +6418,7 @@ msgstr "" msgid "You should select the type of exception" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:93 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:103 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:63 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 @@ -6417,7 +6470,7 @@ msgstr "" msgid "Number of iterations" msgstr "" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:60 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:61 msgid "Template Tree" msgstr "" @@ -6444,11 +6497,15 @@ msgstr "" msgid "Status" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:321 +msgid "from {0}" +msgstr "" + #: libreplan-webapp/src/main/webapp/settings/settings.zul:111 msgid "Resource load view" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:787 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:813 msgid "the date must be inside the visualization area" msgstr "" @@ -6598,8 +6655,8 @@ msgid "Task Scheduling Status In Project" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:162 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:356 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:868 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:376 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:872 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313 msgid "Confirm" msgstr "" @@ -6651,8 +6708,8 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1214 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:346 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:984 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:990 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1101 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1107 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:289 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 @@ -6671,7 +6728,7 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:201 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:333 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:406 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1247 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1251 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:49 @@ -6696,10 +6753,8 @@ msgstr "" #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:154 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:106 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:46 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:68 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:40 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:115 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:148 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:137 #: libreplan-webapp/src/main/webapp/templates/_list.zul:53 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52 @@ -6799,7 +6854,7 @@ msgid "Stretches" msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:79 -msgid "Interporlation" +msgid "Interpolation" msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:80 @@ -6863,23 +6918,23 @@ msgstr "" msgid "Blocked" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:29 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:31 msgid "as soon as possible" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:41 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:38 msgid "start not earlier than" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:53 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:45 msgid "start in fixed date" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:65 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:57 msgid "as late as possible" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:77 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:64 msgid "finish not later than" msgstr "" @@ -6919,7 +6974,7 @@ msgstr "" msgid "Project creation allowed" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:122 +#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:132 msgid "Line" msgstr "" @@ -7087,23 +7142,23 @@ msgstr "" msgid "U" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:618 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:629 msgid "" "Some ancestor has the same label assigned, so this element is already " "inheriting this label" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:717 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:728 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:963 msgid "Cannot spread two progress in the same task" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:741 -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:767 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:752 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:778 msgid "Duplicate Progress Assignment For Task" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1094 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1105 msgid "Quality form already exists" msgstr ""