From 973f631619eaf262b369f22ce08d627f547b6c90 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Wed, 11 May 2011 18:25:01 +0200 Subject: [PATCH] [i18n] Updating keys.pot files. FEA: ItEr74S03CommunityMaterialItEr73S03 --- ganttzk/src/main/resources/i18n/keys.pot | 128 +- .../BaseCalendarEditionController.java | 6 +- .../web/orders/OrderCRUDController.java | 2 +- .../AdvancedAllocationController.java | 2 +- .../web/planner/allocation/AllocationRow.java | 4 +- .../src/main/resources/i18n/keys.pot | 5778 ++++++++--------- .../src/main/webapp/common/layout/login.zul | 4 +- .../main/webapp/common/layout/template.zul | 2 +- .../hoursWorkedPerWorkerInAMonthReport.zul | 4 +- 9 files changed, 2776 insertions(+), 3154 deletions(-) diff --git a/ganttzk/src/main/resources/i18n/keys.pot b/ganttzk/src/main/resources/i18n/keys.pot index 6625d01ab..21c39939f 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.5\n" +"Project-Id-Version: 1.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-08 10:41+0200\n" +"POT-Creation-Date: 2011-05-11 18:16+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,126 +21,126 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:214 -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:233 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:215 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:234 msgid "Erase" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:308 +#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:319 msgid "Add Dependency" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:57 +#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58 msgid "Worker" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:28 +#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:29 msgid "Start" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:591 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:592 msgid "Show reported hours" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:75 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:78 msgid "Show/Hide Progress" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:88 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:92 msgid "by criteria" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:82 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:70 msgid "Show/Hide reported hours" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35 #: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:45 +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:36 msgid "Zoom" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java:120 +#: ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java:121 msgid "Limiting resources" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:67 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:68 msgid "The specified dependency is not allowed" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:253 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:254 msgid "Set End-End" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:57 +#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58 msgid "Task" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:87 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:91 msgid "by resources" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:63 +#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:64 msgid "Criterion" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:41 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:40 msgid "Print" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:189 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:190 msgid "total work hours: {0}, assigned hours: {1}" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:70 +#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:71 msgid "Week" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java:110 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java:111 msgid "See scheduling" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:449 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:489 msgid "filtering by name" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:29 +#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:30 msgid "End" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:242 +#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:243 msgid "changing zoom" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:44 +#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:45 msgid "Quarter" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:57 +#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58 msgid "None" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:68 -msgid "Flatten/Unflatten tree" -msgstr "" - -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:43 +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:44 msgid "Filter" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:57 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:67 +msgid "Flatten/Unflatten tree" +msgstr "" + +#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58 msgid "Project" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:50 +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:51 msgid "Name filter" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:27 -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:68 +#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:28 +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:69 msgid "Name" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:571 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:572 msgid "Show progress" msgstr "" @@ -148,19 +148,19 @@ msgstr "" msgid "Expand/Collapse all" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:34 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:36 msgid "Create Project" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:141 -msgid "showing criteria" -msgstr "" - -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:31 +#: 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:57 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:145 +msgid "showing criteria" +msgstr "" + +#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:58 msgid "Month" msgstr "" @@ -168,23 +168,23 @@ msgstr "" msgid "Show/Hide resources" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:245 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:246 msgid "Set End-Start" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:301 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:302 msgid "decreasing zoom" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:558 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:559 msgid "Hide critical path" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:598 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:599 msgid "Hide reported hours" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:83 +#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:84 msgid "Day" msgstr "" @@ -192,11 +192,11 @@ msgstr "" msgid "Show/Hide Critical path" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:138 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:142 msgid "showing resources" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:183 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:184 msgid "Load: {0}%" msgstr "" @@ -204,32 +204,32 @@ msgstr "" msgid "Show/Hide labels" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:96 +#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:97 msgid "Hour" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:91 -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:111 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:114 +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:92 msgid "Graphics" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:249 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:250 msgid "Set Start-Start" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:142 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:143 msgid "See resource allocation" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:284 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:285 msgid "increasing zoom" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:415 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:455 msgid "Show all elements" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:414 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:454 msgid "All" msgstr "" @@ -237,10 +237,10 @@ msgstr "" msgid "Refresh" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:553 -msgid "Show critical path" -msgstr "" - -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:576 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:577 msgid "Hide progress" msgstr "" + +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:554 +msgid "Show critical path" +msgstr "" diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java index 86a7b7148..deedb222e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java @@ -105,11 +105,11 @@ public abstract class BaseCalendarEditionController extends } EnumMap decomposed = duration.decompose(); - String result = _("{0}:", decomposed.get(Granularity.HOURS)); - result += _("{0}", decomposed.get(Granularity.MINUTES)); + String result = decomposed.get(Granularity.HOURS) + ":"; + result += decomposed.get(Granularity.MINUTES); if (decomposed.get(Granularity.SECONDS) > 0) { - result += _(" {0}s", decomposed.get(Granularity.SECONDS)); + result += " " + decomposed.get(Granularity.SECONDS) + "s"; } return result; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java index ca6b98630..54b70aea3 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java @@ -884,7 +884,7 @@ public class OrderCRUDController extends GenericForwardComposer { try { if (Messagebox .show( - _("Deleting this subcontrated order, you is going to lose the relation to report advances. Are you sure?"), + _("Deleting this subcontracted project, you are going to lose the relation to report progress. Are you sure?"), _("Confirm"), Messagebox.OK | Messagebox.CANCEL, Messagebox.QUESTION) == Messagebox.CANCEL) { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java index 6d97028c1..727779f40 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java @@ -956,7 +956,7 @@ public class AdvancedAllocationController extends GenericForwardComposer { private Row buildGroupingRow(AllocationInput allocationInput) { Restriction restriction = allocationInput.getResultReceiver() .createRestriction(); - String taskName = _("{0}", allocationInput.getTaskName()); + String taskName = allocationInput.getTaskName(); Row groupingRow = Row.createRow(messages, restriction, taskName, 0, allocationInput.getAllocationsSortedByStartDate(), false, allocationInput.task); return groupingRow; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java index 0b8b978a0..9f5ae1817 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java @@ -370,8 +370,8 @@ public abstract class AllocationRow { .setTooltiptext(_( "Only {0} resources per day were achieved for current allocation", realResourcesPerDay.getAmount().toPlainString())); - this.realResourcesPerDay.setValue(_("[{0}]", - realResourcesPerDay.getAmount().toPlainString())); + this.realResourcesPerDay.setValue(realResourcesPerDay.getAmount() + .toPlainString()); } private void clearRealResourcesPerDay() { diff --git a/navalplanner-webapp/src/main/resources/i18n/keys.pot b/navalplanner-webapp/src/main/resources/i18n/keys.pot index 53685141d..cd09e08f1 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.5\n" +"Project-Id-Version: 1.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-08 10:41+0200\n" +"POT-Creation-Date: 2011-05-11 18:16+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,349 +21,337 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:350 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:368 msgid "The resource cannot be null" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:418 -msgid "criterion codes must be unique inside a criterion type" +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:419 +msgid "criterion codes must be unique inside a criterion " +"type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:95 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:96 msgid "No authorizations were added because you did not select any." msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:95 -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:44 -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:53 -#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:70 -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:50 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:88 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:45 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:54 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:58 +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:71 msgid "en" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:154 -msgid "Create exception" +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:188 +msgid "Origin" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:145 -msgid "Origin" +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:165 +msgid "Create exception" msgstr "" #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:45 msgid "Select report data" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:389 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:399 msgid "Up to company view" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:206 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:207 msgid "there exist multiple resource calendars with name {0}" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:59 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:60 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: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 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:75 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29 -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:39 -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:38 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:33 -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:43 -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:36 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:39 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:38 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:28 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:97 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:139 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:180 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:101 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:142 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:99 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:127 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:98 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:820 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:109 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:150 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:122 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:91 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:119 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:159 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:97 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:139 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:180 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:101 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:101 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:142 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:77 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:28 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81 -#: 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 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:35 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:158 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:68 -#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:37 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:39 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:61 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:87 -#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:28 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:146 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:233 -#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:29 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:269 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:34 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:39 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:40 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:50 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:51 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:54 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:69 +#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:141 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:50 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:36 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:57 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:50 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:48 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:28 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:135 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:159 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:36 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:52 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:231 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35 msgid "Operations" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:29 -msgid "Add criterion" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:134 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:194 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:149 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:535 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:135 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:195 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:150 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:536 msgid "There is no type of work hours with this code" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:100 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:154 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:107 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:84 msgid "Select" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:355 -msgid "there must be {0} hours instead of {1}" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1280 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1356 msgid "It can not be empty" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:270 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:21 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:65 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:52 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:144 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:54 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:33 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:88 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:21 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:315 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:33 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:66 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:98 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:53 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:145 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:55 msgid "Materials" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:293 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:360 msgid "Reassign" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:61 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:62 msgid "Description cannot be null or empty" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:78 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:79 msgid "login name not specified" msgstr "" -#: 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 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MonteCarloTabCreator.java:79 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MonteCarloTabCreator.java:356 msgid "MonteCarlo Method" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:291 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:309 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:292 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:310 msgid "Project Scheduling" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:41 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:72 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:62 msgid "February" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:27 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:28 msgid "Managing fields and labels" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:355 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:356 msgid "Please, select a calendar" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:188 -msgid "Summary" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28 -#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:161 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29 msgid "Predefined" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:271 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:66 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:267 +msgid "Summary" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:316 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:67 msgid "Quality Forms" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:285 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:330 msgid "Reports" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:167 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:168 msgid "The {0} sequence prefixes can not be repeated" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:80 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:81 msgid "Criterion requirements" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:95 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:97 msgid "START_NOT_EARLIER_THAN" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:216 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:287 msgid "Stretch date must not be less than task start date: " msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:65 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:66 msgid "Dedication chart" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:700 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:727 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:701 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:728 msgid "Progress that are reported by quality forms can not be modified" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:747 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:748 msgid "Not the same hours group, impossible to update" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:519 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:43 +#: navalplanner-webapp/src/main/webapp/common/error.zul:48 +msgid "Stacktracke:" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:520 msgid "Cannot delete that material because it is assigned to a project." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:472 -msgid "Remove limiting resource element" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:140 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:154 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:240 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:141 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:155 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:275 msgid "Resource Usage" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:38 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:475 +msgid "Remove limiting resource element" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:39 msgid "Active period from" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:51 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:52 msgid "hours type :" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:480 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:481 msgid "Unassign" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:250 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:295 msgid "Companies" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:504 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:505 msgid "Manual assignment" msgstr "" -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:72 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:73 msgid "Quality form items list" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:239 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:217 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:218 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:240 msgid "" "End date is not valid, the new end date must be later the current end date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:45 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:51 msgid "generic workers allocation" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:63 -msgid "Select print visualization options" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:797 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:796 msgid "Hour start" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:896 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:515 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:516 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:915 msgid "The project has no scheduled elements" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:119 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:52 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:35 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:53 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:36 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:120 msgid "Start" msgstr "" -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:33 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:34 msgid "Progress Report" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:118 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:119 msgid "cost assignment's category not specified" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:71 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:72 msgid "Delete Template element" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/order.zul:89 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:96 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:90 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:97 msgid "Progress Consolidation" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/services/DBUserDetailsService.java:65 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/services/DBUserDetailsService.java:66 msgid "User with login name '{0}': not found" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:36 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:37 msgid "Resources capability" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:155 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:204 msgid "The first stretch must be after the first day for doing interpolation" msgstr "" -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:25 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26 msgid "Filter quality forms by :" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:260 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:31 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:305 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:32 msgid "Transfer Projects Between Scenarios" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:102 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:106 msgid "changing perspective" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:123 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:124 msgid "" "Could not add those authorizations to profile {0} because they were already " "present." @@ -373,63 +361,68 @@ msgstr "" msgid "Default calendar" msgstr "" -#: navalplanner-webapp/src/main/webapp/users/profiles.zul:22 +#: navalplanner-webapp/src/main/webapp/users/profiles.zul:23 msgid "NavalPlan: Profiles" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/error.zul:20 -msgid "NavalPlan: Error" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:74 msgid "Project Name" msgstr "" -#: 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 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:306 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:931 msgid "Indent" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:575 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:255 +msgid "Reassignation" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:730 msgid "" "The periods available depend on the satisfaction of the criterions by the " "resources and their calendars." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:50 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:42 msgid "New template" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:127 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:38 +msgid "Total estimated hours" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:130 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:144 msgid "Base calendar \"{0}\" saved" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:174 +msgid "Exceptions list" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:32 msgid "Locations" msgstr "" -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:75 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:76 msgid "New quality form item" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:145 -msgid "For interpolation at least two stretches are needed" -msgstr "" - #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:41 msgid "Login name" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:42 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:43 msgid "Current" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:626 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:632 msgid "Machine deleted" msgstr "" -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:21 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:22 msgid "NavalPlan: Progress Report" msgstr "" @@ -437,87 +430,102 @@ msgstr "" msgid "Dependencies" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:185 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:187 msgid "missing code in a calendar exception" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:85 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:78 msgid "Current selection" msgstr "" -#: 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" +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1134 +msgid "there exist criterion satisfactions referring to " +"criterion types not applicable to this resource" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:64 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:52 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:65 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:50 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:53 msgid "Criterion Requirement" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:62 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:31 +msgid "Show labels" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:63 msgid "Minutes" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:131 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:132 msgid "You can not remove a scenario with derived scenarios" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:22 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:23 msgid "Create new version" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:293 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/ResourceAllocationBehaviour.java:65 +msgid "LIMITING" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:324 msgid "Derived" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:349 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:414 msgid "a disabled resource has enabled subresources" msgstr "" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:28 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:51 msgid "Client" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:152 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:613 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:153 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:614 msgid "" "there are no resources for required criteria: {0}. So the generic allocation " "can't be added" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:427 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:446 +msgid "Error on showing warning message removing calendar: " +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:428 msgid "work report has not any description value with this field name" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java:152 +#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java:153 msgid "material category name has to be unique. It is already used" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:43 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:108 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:46 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109 msgid "Imputed hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:292 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:337 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:41 msgid "Project Costs Per Resource" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:461 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:142 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:530 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 msgid "Confirm deleting this hour cost. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/DeleteMilestoneCommand.java:58 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/DeleteMilestoneCommand.java:59 msgid "Delete Milestone" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:47 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:152 +msgid "default password were not changed" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:48 msgid "Non-assigned locations" msgstr "" @@ -525,99 +533,103 @@ msgstr "" msgid "Application URI" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:417 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:418 msgid "" "The {0} is not valid, criterionType overlaps with other " "criterionSatisfaction from the same criterionType" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:286 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:331 msgid "Work Report Lines" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1446 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1466 msgid "Configure" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:80 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:70 msgid "October" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:56 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:57 msgid "First name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:245 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:252 msgid "Could not execute print command" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:118 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:119 msgid "Complementary text fields" 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: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: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 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:376 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:137 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:291 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:141 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:418 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:852 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:199 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:208 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1242 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:181 msgid "Confirm deleting {0}. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:36 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:37 msgid "Work Reports List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:267 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:312 msgid "Accounts" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:46 -msgid "Edit selected task" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:84 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:85 msgid "External code" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:38 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:37 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:96 -msgid "Limiting" +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:47 +msgid "Edit selected task" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:48 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:49 msgid "View" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:309 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:88 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:39 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:38 +msgid "Limiting" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:61 +msgid "Required materials" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:311 msgid "Backwards" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:627 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:629 msgid "resources per day must be not empty and bigger than zero" msgstr "" -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:67 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:77 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:68 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:78 msgid "Version" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:50 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51 msgid "Apply filtering to resources satisfying required criteria" msgstr "" -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:103 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:104 msgid "Up" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:183 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:184 msgid "" "CriterionType is not valid, it overlaps other criterionSatisfaction with the " "same criterionType" @@ -627,7 +639,7 @@ msgstr "" msgid "Types of work hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:126 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:127 msgid "EAC" msgstr "" @@ -637,7 +649,7 @@ msgid "" "Should change to any of the following scenarios:\n" msgstr "" -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:36 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:37 msgid "Predecessor" msgstr "" @@ -645,41 +657,41 @@ msgstr "" msgid "Please select a task" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:135 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:189 msgid "Some stretch has higher or equal values than the previous stretch" msgstr "" -#: navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul:22 +#: navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul:23 msgid "NavalPlan: Cost Categories" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:59 -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:57 -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:74 -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:62 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:58 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:75 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:60 msgid "End date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:254 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:255 msgid "missing worker code in the work report" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:140 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:142 msgid "" "Value is not valid, the default max value must be greater than the precision " "value " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:145 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:146 msgid "" "You can not remove the company \"{0}\" because is already in use in some " "project or in some subcontrated task." msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:87 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:88 msgid "profile name is already being used by another profile" msgstr "" @@ -691,209 +703,207 @@ msgstr "" msgid "Prefix:" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:106 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:109 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:111 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:107 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:110 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:112 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: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 -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:43 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:580 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:320 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 msgid "Criteria" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:363 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:381 msgid "The task code cannot be null" msgstr "" +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:138 +msgid "Resource / Criteria" +msgstr "" + #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:26 msgid "User data" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 -msgid "Resource / Criteria" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:84 -msgid "AS_SOON_AS_POSSIBLE" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:96 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:97 msgid "Error setting up creation form." msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:86 +msgid "AS_SOON_AS_POSSIBLE" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:29 msgid "Add new progress assignment" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:43 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:44 msgid "Lines" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:192 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:193 msgid "Error on showing warning message removing workReportType: " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:625 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:624 msgid "Edit Work Report" msgstr "" -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:21 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:22 msgid "Quality Forms List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:169 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:170 msgid "Project version is the same in source and destination scenarios" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:30 msgid "Personal data" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:298 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:161 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:199 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:157 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:198 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:299 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:162 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:158 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:199 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:200 msgid "please, select a Criterion" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:731 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:732 msgid "Calculated progress can not be removed" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java:126 -msgid "Project does not exist" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:76 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:66 msgid "June" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java:92 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java:127 +msgid "Project does not exist" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/EntryPointsHandler.java:143 msgid "{0} annotation required on {1}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:1030 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:1031 msgid "Modified" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:215 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:216 msgid "Add Criterion" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:642 -msgid "format prefix invalid. It cannot be empty or contain whitespaces." -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:126 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:329 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:643 +msgid "format prefix invalid. It cannot be empty or contain whitespaces." +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:334 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:89 msgid "MessagesContainer is needed" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:37 msgid "Project element code" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:41 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28 -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:68 -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:43 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:69 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:42 msgid "Ending date" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:75 -msgid "Show all progress" +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:21 +msgid "Templates List" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:20 -msgid "Templates List" +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:29 +msgid "Export options" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:34 +msgid "Subcontracted Tasks List" msgstr "" #: navalplanner-webapp/src/main/webapp/common/configuration.zul:229 msgid "Last value" msgstr "" -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:33 -msgid "Subcontracted Tasks List" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:704 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:705 msgid "Calculated progress can not be modified" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:68 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:69 msgid "Statistics log" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:46 -#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:39 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:47 +#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:40 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:51 msgid "Edit Calendar" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:294 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:339 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:41 msgid "Materials Needs At Date" msgstr "" +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:41 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:52 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:40 msgid "Cannot be empty or null" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:274 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:275 msgid "filtering" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:33 msgid "Total Budget" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:52 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:53 msgid "Hierarchy" msgstr "" -#: navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:22 +#: navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:23 msgid "NavalPlan: Work Hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:812 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:830 msgid "" "This worker cannot be deleted because it has assignments to projects or " "imputed hours" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:25 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:26 msgid "Print configuration" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:26 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:27 msgid "Overload due to other assignments" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:148 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:149 msgid "Time period saved" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:304 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:167 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:205 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:163 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:204 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:305 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:168 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:164 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:205 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:206 msgid "This Criterion has already been added." msgstr "" @@ -905,75 +915,78 @@ msgstr "" 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 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:35 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:41 msgid "Filter work report by :" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeModel.java:84 -msgid "Cannot remove {0}, since it is being used by some Exception Day" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:245 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:290 msgid "Workers" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:78 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/ResourceAllocationBehaviour.java:40 +msgid "NON_LIMITING" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeModel.java:102 +msgid "Cannot remove {0}, since it is being used by some Exception Day" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:68 msgid "August" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:57 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:53 msgid "Resources matching selected criteria" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:54 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:62 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:52 msgid "Year" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:66 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:67 msgid "profile name not specified" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:61 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:62 msgid "Date Start" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1280 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1281 msgid "Value is not valid, the current value must be less than max value" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:54 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:55 msgid "From Chosen" msgstr "" +#: navalplanner-webapp/src/main/webapp/planner/order.zul:109 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67 +msgid "Value" +msgstr "" + #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:64 msgid "Hour costs" msgstr "" -#: 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 -msgid "Value" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:558 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:713 msgid "there are no valid periods for this calendar" msgstr "" -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:40 -msgid "Edit Scenario" -msgstr "" - #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:76 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:52 msgid "Add role" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:568 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1039 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:41 +msgid "Edit Scenario" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:643 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1113 msgid "Exception end date should be greater or equals than start date" msgstr "" @@ -981,11 +994,11 @@ msgstr "" msgid "Project from client" msgstr "" -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:21 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:22 msgid "Progress Types List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:414 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:415 msgid "" "The {0} can not be assigned to this resource. Its interval overlaps with " "other criterion" @@ -995,11 +1008,11 @@ msgstr "" msgid "Work done until ending date:" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:131 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:132 msgid "Schedule Performance Index" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:138 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:139 msgid "Earlier starting date" msgstr "" @@ -1007,31 +1020,31 @@ msgstr "" msgid "Type data" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:268 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:313 msgid "Profiles" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:801 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:800 msgid "Hour finish" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:39 -msgid "Edit Work Report Type" -msgstr "" - #: navalplanner-webapp/src/main/webapp/common/configuration.zul:173 msgid "Perspectives" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:78 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:40 +msgid "Edit Work Report Type" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:104 msgid "Workable time" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:239 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:240 msgid "missing code in a subcategory" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:475 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:544 msgid "Confirm deleting this cost category. Are you sure?" msgstr "" @@ -1051,89 +1064,89 @@ msgstr "" msgid "Limiting resource allocation" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:948 -msgid "{0}" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:462 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:463 msgid "Split new assignment" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:187 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:231 -msgid "Expiry date" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:67 -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:52 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:53 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:68 msgid "Pagination" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:336 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:265 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:286 +msgid "Expiry date" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:337 msgid "" "The operation does not perform because the task has progress reports that is " "spread associated with this quality form" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:74 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:82 msgid "Change scenario" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:343 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:344 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:83 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:68 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloModel.java:84 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:69 msgid "Critical path" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:41 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:71 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:38 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:42 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:83 msgid "Categories" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:45 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:180 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:39 +#: navalplanner-webapp/src/main/webapp/common/error.zul:44 +msgid "Status code:" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:46 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:181 msgid "Project Details" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:93 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:94 msgid "Create Criterion Type" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:225 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:117 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:202 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:225 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163 -#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:47 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185 msgid " to go to output directly" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:167 msgid "Add new hours group" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:218 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:219 msgid "Criteria: {0} " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:384 -#: 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 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:84 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:385 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:110 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:63 msgid "Percentage" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:136 msgid "Updated" msgstr "" @@ -1141,7 +1154,7 @@ msgstr "" msgid "Company logo URL" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:130 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:131 msgid "No worker selected" msgstr "" @@ -1149,29 +1162,29 @@ msgstr "" msgid "Number of digits" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1628 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1651 msgid "Task not found" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:38 -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:38 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:39 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:39 msgid "Total capability" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:663 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:684 msgid "It not could remove the task " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:232 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:217 msgid "Problems connecting with client web service" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:20 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:21 msgid "NavalPlan: User access" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:120 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:142 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:154 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:183 msgid "Exception Type" msgstr "" @@ -1179,40 +1192,44 @@ msgstr "" msgid "NavalPlan: Materials" msgstr "" -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:21 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:22 msgid "Profiles List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:277 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:278 msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:236 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:853 -#: 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: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 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:50 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:567 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:896 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:322 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:64 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:68 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:51 msgid "Labels" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:273 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:139 +msgid "is not supported for its use with NavalPlan." +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:318 msgid "Data Types" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:154 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:67 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:155 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68 msgid "Total hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:339 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:343 msgid "Reassigning {0} projects" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:83 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:84 msgid "Create Work Hours Type" msgstr "" @@ -1220,17 +1237,17 @@ msgstr "" msgid "Filter by task status" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:471 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:422 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:423 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:533 msgid "Select date:" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:561 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1032 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:636 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1106 msgid "You should select a end date for the exception" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:33 +#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:34 msgid "Please try it again." msgstr "" @@ -1238,147 +1255,143 @@ msgstr "" msgid "Company code" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:109 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:110 msgid "Unknown attribute '{0}' in class {1}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:704 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:714 msgid "NON LIMITING RESOURCE" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:22 msgid "NavalPlan: Workers" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:123 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:125 msgid "as late as possible" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:88 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:117 msgid "Activation periods" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:388 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:389 msgid "Passed" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:87 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:127 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:174 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:88 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:175 msgid "already assigned" msgstr "" -#: 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:119 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:130 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:155 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:68 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:131 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:119 msgid "Calendar" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:92 -msgid "{0}h" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:30 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:55 -msgid "Read" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:255 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:300 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:99 msgid "Resources" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:152 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:56 +msgid "Read" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:153 msgid "Source and destination scenarios should be different" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:229 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:230 msgid "CriterionType and its criteria saved" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:70 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:137 +msgid "The browser you are using" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:78 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 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:50 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:49 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:209 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:41 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:248 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:29 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:50 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:51 msgid "to" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:178 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:197 msgid "Error on removing typeOfWorkHours: " msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:111 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:112 msgid "worker's first name not specified" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:275 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:276 msgid "date not specified" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:94 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:95 msgid "Select type :" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:258 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:268 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:238 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:259 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:269 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:263 msgid "Projects Planning" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:73 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:37 msgid "Shrink to fit page width" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:66 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:67 msgid "Last name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:549 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:322 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:348 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:551 msgid "Remove" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:253 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:254 msgid "cost category name not specified" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:22 msgid "NavalPlan: Virtual Workers Groups" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:131 msgid "SPI" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:217 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:244 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:245 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:218 msgid "" "Start date is not valid, the new start date must be previous the current " "start date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:389 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:390 msgid "the code must be not null or not empty" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:33 +#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:34 msgid "Create New Project" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1337 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1357 msgid "Stretches list" msgstr "" @@ -1386,41 +1399,41 @@ msgstr "" msgid "Enable scenarios module" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:59 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:60 msgid "Zoom" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:520 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:135 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:80 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:104 -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:37 -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:40 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:129 -#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:39 -#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:40 -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:94 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:88 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:519 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:106 #: 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: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 -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:37 -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:88 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:95 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:117 -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:38 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:129 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:76 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:45 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:50 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:39 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:130 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:46 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:52 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:130 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:38 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:42 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:54 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:185 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:37 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:41 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:211 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:38 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:41 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:135 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:80 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:241 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:80 msgid "Save" msgstr "" @@ -1428,150 +1441,154 @@ msgstr "" msgid "Material categories" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:131 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:61 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:33 +msgid "Standard Effort" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:133 msgid "Pending update" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:67 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:59 msgid "End date:" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:159 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:160 msgid "Criterion previously selected" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:50 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:51 msgid "Users authorization" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:172 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:177 msgid "Problems connecting with subcontractor web service" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:43 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:44 msgid "Assigned load" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:76 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:68 msgid "Filter by workers" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:116 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:139 msgid "End Date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:368 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:374 msgid "Some allocations needed" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:129 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82 msgid "Resources Per Day" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:215 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:216 msgid "ResourceType must be not-null" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:94 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:95 msgid "" "Estimated end date for the task (press enter in textbox to open calendar " "popup or type in date directly)" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:280 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:281 msgid "Expand/Collapse all" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:31 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:32 msgid "Overload due to current project" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:867 +msgid "Move down" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:116 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:112 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:137 +msgid "Please, select a project" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:841 msgid "Name: {0}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:866 -msgid "Move down" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:115 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:111 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:136 -msgid "Please, select a project" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:79 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:69 msgid "September" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:26 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:27 msgid "Report structure" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:87 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:88 msgid "password not specified" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:58 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:41 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:117 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:59 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:42 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:118 msgid "General data" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:126 msgid "BAC" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:428 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:399 msgid "Calculate Number of Hours" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:37 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:80 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81 msgid "Assign" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java:129 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java:130 msgid "missing code in a criterion" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1278 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1297 msgid "Create Template" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:22 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:22 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:22 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:23 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:23 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:23 msgid "NavalPlan: Work Reports" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:114 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:115 msgid "Edit Company" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:78 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:114 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:67 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:60 msgid "Advanced search" msgstr "" +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:86 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:78 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:99 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:116 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:78 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:107 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:78 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:86 msgid "Filter by labels" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:669 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:672 msgid "" "IMPORTANT: Don't forget to communicate to subcontractor that his contract " "has been cancelled" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:37 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:38 msgid "MonteCarlo chart" msgstr "" @@ -1579,263 +1596,274 @@ msgstr "" msgid "NavalPlan: Hours Worked Per Resource" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:126 msgid "Schedule Variance" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:409 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:410 msgid "Service does not manage resource of type: {0}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:601 -#: 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 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:185 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:442 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1302 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:604 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:642 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:673 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:191 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:210 msgid "Warning" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:34 -#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:30 msgid "Select parent calendar" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:95 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:167 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:462 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:525 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:96 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:168 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:463 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:526 msgid "There is no task with this code" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:292 -msgid "criterion satisfaction with end date less than start date" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:214 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:433 +msgid "The type of hours cannot be null" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:297 +msgid "criterion satisfaction with end date less than start " +"date" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:230 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:189 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:214 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:197 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:122 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:170 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:112 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:206 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:230 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:167 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:48 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:189 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49 msgid "Show" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:75 -msgid "Assignment Type" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:57 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:58 msgid "Duration (days)" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/index.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:22 -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/resources_use.zul:21 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:21 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:21 -#: navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:71 +msgid "Assignment Type" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/index.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/resources_use.zul:22 +#: navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul:22 msgid "NavalPlan: Scheduling" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:28 +#: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:29 msgid "Back to log in" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:480 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:482 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:481 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:483 msgid "Error on splitting" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:76 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:31 msgid "Planned start :" msgstr "" -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46 -msgid "Company" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:65 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:66 msgid "Node without children" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:117 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47 +msgid "Company" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:118 msgid "There is no label with this code " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:209 -msgid "Task: {0} " +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:138 +msgid "Profile saved" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:136 -msgid "Profile saved" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:210 +msgid "Task: {0} " msgstr "" #: navalplanner-webapp/src/main/webapp/planner/editTask.zul:65 msgid "Task properties" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:74 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:75 msgid "There is no type of work report with this code" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:55 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:56 msgid "Sum of direct imputed hours" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:34 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:35 msgid "Surname" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1289 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1301 msgid "You need to select some function to configure" msgstr "" -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:21 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:22 msgid "Exception Day Types List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:374 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:375 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:742 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:48 -#: 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/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:393 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:741 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:31 -#: 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/workreports/workReport.zul:156 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:66 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:67 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:115 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:111 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:77 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:68 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:131 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:67 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:157 msgid "Date" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:40 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:363 +msgid "there must be {0} effort instead of {1}" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:41 msgid "Add From Template" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:600 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:638 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:603 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:641 msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/webapp/excetiondays/exceptionDays.zul:21 +#: navalplanner-webapp/src/main/webapp/excetiondays/exceptionDays.zul:22 msgid "NavalPlan: Exception Days" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:640 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:641 msgid "" "format prefix invalid. It cannot be empty or contain '_' or whitespaces." msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:55 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:45 msgid "Filter by month" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:525 -msgid "The quality form must have an item with 100% value to report progress" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:350 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:360 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:319 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:361 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:351 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:320 msgid "The criterion and its type cannot be null" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:212 -msgid "The code is not valid. There is another unit type with the same code" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:526 +msgid "The quality form must have an item with 100% value to report progress" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:77 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:67 msgid "July" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:517 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:220 +msgid "The code is not valid. There is another unit type with the same code" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:543 msgid "( max: {0} )" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:208 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:218 msgid "Error on removing element: " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:41 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:71 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:61 msgid "January" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:63 -msgid "Cannot calculate charts for current data" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:53 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:54 msgid "Select queue" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:513 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:64 +msgid "Cannot calculate charts for current data" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:582 msgid "The cost category had already been removed." msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:47 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:48 msgid "Work description" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:64 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:59 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:63 msgid "Split assignment" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:117 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:118 msgid "You can not remove the default scenario called \"{0}\"" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:546 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:572 msgid "There are not any assigned progress to current task" msgstr "" -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:109 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:110 msgid "Down" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:224 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:184 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:209 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:192 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:116 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:165 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:106 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:201 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:224 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:162 -#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:46 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:184 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/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:934 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:36 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:48 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:89 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:47 msgid "Label" msgstr "" -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:36 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:37 msgid "Create Scenario" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:833 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:834 msgid "Value is not valid, taking into account the current list of HoursGroup" msgstr "" @@ -1844,92 +1872,95 @@ msgstr "" msgid "Association with roles" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:383 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:384 msgid "missing type of work hours in a work report line" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:29 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:30 msgid "Quality forms" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:143 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:144 msgid "Hours group" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:95 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:29 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:30 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:96 msgid "Days from Beginning to Deadline" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:127 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:128 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 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:421 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:194 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:373 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:200 msgid "Delete item. Are you sure?" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:101 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:102 msgid "cost assignment's start date not specified" msgstr "" +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:178 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:92 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:167 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:189 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:208 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:170 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:197 -#: 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 "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:44 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:956 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1030 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:45 msgid "Direct" msgstr "" -#: 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/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:818 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:189 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:268 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:289 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:52 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:83 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:34 msgid "Op." msgstr "" -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:43 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:44 msgid "Pessimistic" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:55 #: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:55 msgid "Reference date:" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:468 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:471 msgid "Limiting resource assignation" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1234 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1235 msgid "" "This progress can not be removed, because it is spread. It is necessary to " "select another progress as spread." msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:87 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:116 msgid "Work week" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:127 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:128 msgid "You will lose the changes. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:28 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:45 msgid "Company ID" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:184 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:192 msgid "Unit type name cannot be empty" msgstr "" @@ -1937,309 +1968,310 @@ msgstr "" msgid "Entity sequences" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:90 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:91 msgid "Delay from beginning (days)" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:303 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:319 msgid "Resource cannot be null" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:533 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:505 msgid "Total Hours" msgstr "" -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:36 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:37 msgid "Create Progress Type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:129 msgid "Confirm cancel" msgstr "" -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:61 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:62 msgid "Label list" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:290 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:335 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 msgid "Work And Progress Per Task" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:39 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:40 msgid "WBS (tasks)" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:90 -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: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: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:689 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:690 msgid "Deleting sequence" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:133 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:538 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:552 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:150 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:299 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:423 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:860 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:895 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:207 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:262 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1250 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:227 +msgid "Error on showing removing element: " +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:92 +msgid "start not earlier than" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:130 msgid "AS_LATE_AS_POSSIBLE" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:79 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:87 msgid "Select scenario" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:135 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:218 msgid "Create Label Type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:232 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:233 msgid "missing work report code in a work report" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:35 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:36 msgid "Create Work Report Type" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51 msgid "Criterion requirement" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:34 -msgid "PDF" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1170 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1246 msgid "Only the last activation period allows to delete end date." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:328 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:148 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:153 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:329 msgid "Scheduling saved" 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:196 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:155 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:27 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:171 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:197 msgid "Add new row" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:781 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:783 msgid "incorrect initialization of the progress assignment controller." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:487 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:488 msgid "Move" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:224 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:28 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:29 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:34 msgid "Overload" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:67 -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:29 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:30 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:68 msgid "Assignment log" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyCaptTimeout.java:44 -msgid "CutycaptTimeout thread exception" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:280 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:21 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:325 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:22 msgid "Work Report Models" msgstr "" -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyCaptTimeout.java:45 +msgid "CutycaptTimeout thread exception" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:48 msgid "Date last progress measurement" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:102 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:103 msgid "Deadline (days since beggining project)" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:404 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:422 msgid "number of hours is not properly calculated based on clock" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:359 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:385 msgid "" "Calendar cannot be removed because it still has children. Some other " "calendar is derived from this one." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:917 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:918 msgid "Value is not valid, the type must be not empty" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:443 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:444 msgid "criterion type name is already being used" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:310 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:326 msgid "Task code cannot be null" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:544 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:570 msgid "It is not allowed to consolidate progress." msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:31 msgid "Create Task" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:97 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:98 msgid "Error setting up creation form for Criterion Type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:139 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:151 msgid "Edit Cost Category" msgstr "" -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:82 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:112 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:26 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:58 -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:27 -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:43 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:65 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:31 -msgid "Actions" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:26 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27 msgid "External company" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:86 -msgid "Exceptions" +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:66 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:29 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:27 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:82 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:112 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:58 +msgid "Actions" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:71 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:80 msgid "Start hour" msgstr "" -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:60 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:115 +msgid "Exceptions" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32 msgid "Over assignable" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:225 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:139 +msgid "Assign materials" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:226 msgid "format filters are not valid" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:50 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:71 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:36 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:37 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:72 msgid "ID" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:350 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:180 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:419 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:181 msgid "The init date cannot be empty" msgstr "" +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:28 +msgid "Is administrator" +msgstr "" + #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:88 msgid "Our company password" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:274 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:133 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:171 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:129 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:170 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:275 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:130 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:171 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:172 msgid "This label has already been added." msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:177 -msgid "Inh." -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/IntegrationEntityModel.java:78 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceServiceREST.java:178 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/IntegrationEntityModel.java:79 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceServiceREST.java:179 msgid "Could not get code, please try again later" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:46 -msgid "A2" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:393 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:394 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_'." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:619 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:625 msgid "Confirm deleting this machine. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:160 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:161 msgid "Hours Group" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:914 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:915 msgid "Unallocated name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:887 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:888 msgid "Move up" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:123 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 msgid "BCWP" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:42 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:43 msgid "Subcontract communication date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:125 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:128 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:280 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:237 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:309 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:281 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:129 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:132 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:262 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:354 msgid "Scheduling" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:125 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:126 msgid "Dependencies have priority" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:126 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:206 +msgid "Unlimited" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:127 msgid "Budget At Completion" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:76 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:77 msgid "Assign Label" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:73 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:74 msgid "Page up" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:230 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:231 msgid "Create new project" msgstr "" @@ -2248,338 +2280,339 @@ msgid "Work done from starting date:" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:849 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:44 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:158 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:34 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:49 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:159 msgid "State" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:79 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:80 msgid "Must start after" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1275 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1287 msgid "Confirm change" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:863 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:865 msgid "You don't have permissions to edit this project" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:37 -msgid "Single image" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:102 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:104 msgid "Edit Profile" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:192 msgid "missing date in a calendar exception" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:524 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:213 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:432 +msgid "" +"Type of hours is empty. Please, create some type of hours before proceeding" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:599 msgid "Exception" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:107 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:179 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:449 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:514 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:108 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:180 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:450 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:515 msgid "There is no resource with this ID" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:191 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:194 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:192 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:196 msgid "Send" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:95 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:103 msgid "user" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java:72 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java:53 msgid "New task" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:115 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:125 msgid "The password for a new user cannot be empty" msgstr "" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:31 msgid "Associated user" msgstr "" -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:27 msgid "Type name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/advances/AdvanceAssignmentPlanningCommand.java:68 -msgid "Progress assignment" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:30 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:181 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:204 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:439 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:33 -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:26 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:182 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:205 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:31 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:440 msgid "All" msgstr "" -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69 +msgid "Progress assignment" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:40 msgid "Edit Progress Type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:456 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:459 msgid "Manual" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:21 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:22 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 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:27 msgid "Receipt date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:209 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:210 msgid "Cannot be higher than Ending date" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:236 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:292 msgid "Create activation period" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:21 -msgid "Workers List" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:31 msgid "Personal details" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:354 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:22 +msgid "Workers List" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:355 msgid "Delete project template. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:47 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:954 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1028 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:48 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:214 msgid "Inherited" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:216 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:217 msgid "Criterion must be not-null" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:525 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:255 +msgid "Worker" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:517 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:595 msgid "" "Cannot allocate selected element. There is not any queue that matches " "resource allocation criteria at any interval of time" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:254 -msgid "Worker" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:160 -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:254 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:161 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:299 msgid "criterion name not specified" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:136 msgid "Value is not valid, the default max value must not be empty " msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:24 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:25 msgid "Manual allocation" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:28 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:29 msgid "External overload" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:32 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:57 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:33 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:58 msgid "Authorize" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:258 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:47 +msgid "Recommended allocation" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:303 msgid "Scenarios" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:374 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:375 msgid "Materials saved" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:55 -msgid "Quarter" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1248 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1249 msgid "" "This progress measurement can not be in current date, because it is " "consolidated. it is necessary to select other date." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:699 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:704 msgid "Other projects" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:163 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:164 msgid "At least one {0} sequence must be active" msgstr "" +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:26 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:111 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:25 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:41 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:65 msgid "Profile name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:241 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:248 msgid "Could open generated PDF" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:106 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:107 msgid "Disable Delete" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:143 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:144 msgid "You should select a source scenario" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:158 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:159 msgid "At least one {0} sequence is needed" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:291 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:336 #: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 msgid "Estimated/Planned Hours Per Task" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:67 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:68 msgid "Assigned" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:45 msgid "Details" msgstr "" -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 msgid "Communication" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:35 msgid "More options" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:184 -msgid "Company saved" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:219 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:179 +msgid "Error: {0}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:234 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:174 -msgid "Error: {0}" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:185 +msgid "Company saved" 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 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:261 msgid "Parent" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:90 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:91 msgid "Earliest date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:126 msgid "Type of work hours saved" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:112 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:239 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:45 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:113 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:269 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:46 msgid "Projects" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:149 -msgid "Create Quality Form" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java:63 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java:64 msgid "Not found converter for {0}" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:69 -msgid "Material assignments" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:150 +msgid "Create Quality Form" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:103 msgid "start in fixed date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:82 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:70 +msgid "Material assignments" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:45 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:72 msgid "December" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:921 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:922 msgid "Text field" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:120 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:122 msgid "" "Value is not valid, the Precision value must be less than the defalt max " "value." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:180 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:181 msgid "Question" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1245 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1246 msgid "" "This progress measurement can not be changed or removed, because it is " "consolidated. It is needed to remove its consolidation." msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:215 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:222 msgid "Create new work week" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:703 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:713 msgid "LIMITING RESOURCE" msgstr "" -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:42 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:43 msgid "Subcontratation" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:534 +msgid "{0} cannot be fulfilled" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:198 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 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:68 msgid "Extended view" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:33 msgid "Work record" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:115 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:116 msgid "Error setting up edition form." msgstr "" @@ -2588,66 +2621,72 @@ msgstr "" msgid "Output format" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:81 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:44 msgid "Print" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:21 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:22 msgid "NavalPlan: Calendars" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:178 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:179 msgid "{0} not found type for criterion " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:394 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:412 msgid "Hours cannot be null" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:68 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:69 msgid "Page down" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:484 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:485 msgid "resource type does not allow enabled criteria" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:51 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:134 -#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:49 -#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:81 -#: 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: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 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:133 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:100 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:92 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:48 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:22 +#: navalplanner-webapp/src/main/webapp/common/error.zul:21 +msgid "NavalPlan: Runtime Error" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:52 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:112 #: 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:243 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:92 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:46 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:101 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:41 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:136 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:49 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:55 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:34 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:134 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:40 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:44 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:85 +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:81 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:41 +#: 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/reassign.zul:50 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:45 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:81 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:216 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:38 -#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:42 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:175 -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:39 -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:43 -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:40 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:135 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:82 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 -#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:33 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:47 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:52 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:141 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:191 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:39 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:43 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:217 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:139 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:84 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:243 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:99 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:86 msgid "Cancel" msgstr "" @@ -2655,187 +2694,183 @@ msgstr "" msgid "General user data" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:31 +#: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:32 msgid "Unschedule" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:201 msgid "Subcontracted task sent successfully" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:72 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:73 msgid "Accumulated hours chart" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:22 msgid "Machines List" msgstr "" -#: 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 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:526 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:661 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:924 msgid "You don't have read access to this project" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:129 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130 msgid "CPI" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:179 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:180 msgid "" "Disable hierarchy will cause criteria tree to be flattened. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 -#: navalplanner-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:37 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:29 -msgid "Units" -msgstr "" - +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:45 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:52 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:53 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:47 msgid "Dates" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:44 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:38 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:28 +msgid "Units" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:45 msgid "Create Calendar" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:131 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:185 msgid "At least one stretch is needed" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:302 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:307 msgid "a day is not valid" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesCommand.java:60 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesCommand.java:61 msgid "Task Properties" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:180 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:192 msgid "Cost category saved" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:236 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:213 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:228 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:214 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:237 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:229 msgid "" "End date is not valid, the new end date must be greater than the start date" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:32 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:33 msgid "name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:168 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:170 msgid "Progress type saved" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:71 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:72 msgid "Delete selected task" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java:129 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java:130 msgid "{0} (max: {1})" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:458 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:459 msgid "end" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:62 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:63 msgid "Log" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:56 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:57 msgid "Authorizations" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:35 -#: navalplanner-webapp/src/main/webapp/common/event_error.zul:28 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:49 +#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:36 msgid "Continue" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java:120 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java:121 msgid "Edit task {0}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:209 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:235 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:236 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:210 msgid "Start date cannot be null" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:252 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:297 msgid "Subcontracting" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:325 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:328 msgid "references" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1283 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1284 msgid "Value is not valid, the Precision value must be exact " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java:53 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java:55 msgid "Generic" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:85 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:41 msgid "Planned workable days :" msgstr "" -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:46 -msgid "Default max value" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:36 msgid "Add criterion requirement" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:878 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:47 +msgid "Default max value" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:880 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 " "current scenario" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:85 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:86 msgid "Percentage of estimated budget hours / hours consumed" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:498 +msgid "Automatic" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionBandboxFinder.java:44 msgid "Criterion Name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:495 -msgid "Automatic" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:47 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:47 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:90 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:52 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:91 msgid "Task" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:80 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:35 msgid "Planned end :" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64 -msgid "2010" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:269 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:127 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:166 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:123 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:164 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:84 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:270 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:124 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:165 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:167 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:85 msgid "please, select a label" msgstr "" @@ -2843,54 +2878,53 @@ msgstr "" msgid "Add profile" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:214 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:215 msgid "filter already exists" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:225 msgid "missing code in a calendar data version" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:39 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:41 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:45 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:40 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:46 msgid "Criterion name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:130 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:131 msgid "values are not valid, the values must not be null" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:31 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:49 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:32 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:78 msgid "Task name" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:127 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:128 msgid "cost assignment's resource not specified" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:46 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:124 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:135 -#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java:72 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:126 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:51 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136 msgid "Project" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:78 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:79 msgid "Unassigned" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:100 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:101 msgid "Add new criterion requirement" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:24 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:25 msgid "Select the date from which the new version will be valid" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:123 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 msgid "Budgeted Cost Work Performed" msgstr "" @@ -2898,21 +2932,35 @@ msgstr "" msgid "Work report" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:297 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:135 +msgid "Change the password" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:302 msgid "the name must be not empty" msgstr "" -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:58 -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:26 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:86 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:27 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:58 msgid "Disabled" msgstr "" -#: 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 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:350 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:736 msgid "Earned value" msgstr "" +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:216 +msgid "Inherited from parent calendar" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:146 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:184 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:210 +msgid "Normal Effort" +msgstr "" + #: 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 " @@ -2920,11 +2968,15 @@ msgid "" "Please save your project before proceeding." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:91 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:137 +msgid "{0} reassignations finished" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:92 msgid "Edit Work Hours Type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:42 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:43 msgid "From Today" msgstr "" @@ -2933,105 +2985,110 @@ msgstr "" msgid "{0} not supported yet" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:52 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:53 msgid "New entry" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:215 -msgid "Some sequences to remove not existed" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:104 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:113 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:211 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:105 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:114 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:212 msgid "Resources Load" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:210 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:216 +msgid "Some sequences to remove not existed" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:211 msgid "Changes have been canceled" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:265 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:280 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:266 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:281 msgid "Machine saved" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:131 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:143 msgid "Create Cost Category" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:73 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:63 msgid "March" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:103 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:104 msgid "Appropriative allocation" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:31 msgid "Assigned criterion requirements" msgstr "" +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:127 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:117 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:138 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:157 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:119 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:146 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:117 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:127 msgid "Filter by criteria" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:36 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:37 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43 msgid "Max value" msgstr "" -#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:21 +#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:22 msgid "Scenarios List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:154 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:156 msgid "The name is not valid, the name must not be null " msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:139 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:140 msgid "Hours to allocate" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:114 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:115 msgid "A category must be selected" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:37 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:134 +msgid "Period" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:38 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:47 msgid "Spread" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:93 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:883 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:150 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:151 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:153 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:902 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:189 msgid "Removed {0}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:800 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:188 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:214 +msgid "Error on showing warning message removing typeOfWorkHours: " +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:818 msgid "Confirm deleting this worker. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:61 -msgid "Group name" +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55 +msgid "Start date:" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:63 -msgid "Start date:" +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:62 +msgid "Group name" msgstr "" #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:81 @@ -3039,28 +3096,29 @@ msgstr "" msgid "Role name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:819 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:837 msgid "This worker was already removed by other user" msgstr "" -#: 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 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:476 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:816 msgid "h" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:114 -msgid "Value is not valid, the precision value must not be empty" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:612 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:611 msgid "Create Work Report" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:358 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:116 +msgid "Value is not valid, the precision value must not be empty" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:359 msgid "Workable capacity for this period " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java:158 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:218 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java:159 msgid "Cannot be null or empty" msgstr "" @@ -3068,61 +3126,57 @@ msgstr "" msgid "Cannot delete profile: it does not exist anymore" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:224 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:225 msgid "Edit Machine" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java:99 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java:77 msgid "Add Milestone" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:119 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:120 msgid "Assign selected items" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:437 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:438 msgid "init" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1211 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1212 msgid "Add new progress measurement" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:541 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:528 msgid "Select for automatic queuing" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:259 -msgid "Scenarios Management" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:191 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:192 msgid "Project {0} transfered" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:95 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:304 +msgid "Scenarios Management" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:96 msgid "Create & Assign" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:131 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:141 msgid "Edit User" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:31 -msgid "Print layout" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:54 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:55 msgid "Maximum/minimum of the estimated hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:678 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:754 msgid "D" 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:111 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:112 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:90 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:93 msgid "Consolidated" msgstr "" @@ -3134,55 +3188,55 @@ msgstr "" msgid "MonteCarlo method" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:984 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1058 msgid "derived exception can not be removed" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:216 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:217 msgid "missing code in a material" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:29 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:108 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:61 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:109 msgid "Customer" msgstr "" -#: 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 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:810 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:86 msgid "Hours type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:155 -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:209 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:156 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:210 msgid "criterion type name not specified" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:219 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:220 msgid "Add Exception" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:404 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:426 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:450 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:405 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:427 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:451 msgid "cannot be empty" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:146 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:105 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:121 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:147 msgid "Heading Fields" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:26 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:26 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:48 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:27 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:48 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:49 msgid "from" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1385 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1405 msgid "Sigmoid function" msgstr "" @@ -3191,179 +3245,179 @@ msgstr "" msgid "Progress type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:580 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:581 msgid "Task {0} : Project is incompatible type with {1}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:154 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:35 +msgid "Expand taskgroups" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:155 msgid "" "Time period contains non valid data. Ending data must be older than starting " "date" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:41 +#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:42 msgid "Save Project" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:255 -msgid "A type must be selected" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:317 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:323 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:318 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:324 msgid "Day is not valid" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:553 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1024 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:628 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1098 msgid "You should select a start date for the exception" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:71 +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:72 msgid "Help" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:129 msgid "Variance At Completion" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:63 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:64 msgid "Exportation options" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:87 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:521 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:966 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:51 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java:45 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:50 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ScenarioBandboxFinder.java:45 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:50 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:374 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:91 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:48 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:31 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:127 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:39 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:25 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:40 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:72 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:26 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:79 -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:47 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:26 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:33 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:30 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:51 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:106 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:54 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:34 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:26 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:40 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:24 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:138 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:179 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:100 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:141 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:97 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:126 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:166 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:98 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:108 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:149 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:98 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:50 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:51 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:71 -#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:35 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:27 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:108 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:33 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:49 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:26 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:41 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:131 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:155 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:66 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:76 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:30 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:49 -#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:26 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:58 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:40 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:81 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:35 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:48 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:29 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:26 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:37 -#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:26 -msgid "Name" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:159 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:160 msgid "" "Could not save time period. Time period overlaps with another non-compatible " "time period" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:161 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:88 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:977 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:493 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:375 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java:46 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:52 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ScenarioBandboxFinder.java:46 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:51 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:108 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:149 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:98 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:89 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:118 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:158 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:138 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:179 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:98 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:100 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:141 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:41 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:74 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:26 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:50 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:52 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:55 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:35 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:58 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:41 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:82 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:40 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:80 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:45 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:67 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:77 +#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:31 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:50 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:80 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:32 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:92 +#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:115 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:72 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:42 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:156 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:39 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:49 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:30 +msgid "Name" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:162 msgid "Delete task" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:68 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:69 msgid "Seconds" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:107 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:108 msgid "please, select an item" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:175 -msgid "Day of week" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:21 -msgid "Companies List" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:374 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:392 msgid "Time Start cannot be null" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1360 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:22 +msgid "Companies List" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:208 +msgid "Day of week" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1380 msgid "Stretches with Interpolation" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:287 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:49 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:332 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:41 msgid "Hours Worked Per Resource" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java:145 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java:146 msgid "The end date cannot be before the init date" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:144 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:145 msgid "cost assignment with end date less than start date" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:62 -msgid "Maximum/minimum of the worked hours" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:34 -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:25 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:35 msgid "Category name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:765 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:63 +msgid "Maximum/minimum of the worked hours" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:766 msgid "Not the same material, impossible to update" msgstr "" @@ -3371,173 +3425,172 @@ msgstr "" msgid "NavalPlan: Work And Progress Per Task" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:56 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:64 msgid "Main menu" msgstr "" -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:21 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:22 msgid "NavalPlan: Progress" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:30 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:31 msgid "MonteCarlo" msgstr "" -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:65 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:49 msgid "Duration" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:37 +#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:38 msgid "Create From Template" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:380 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:381 msgid "There exists other workReportType with the same name." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:149 -#: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:150 +#: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:29 msgid "Schedule" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:163 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:35 +#: navalplanner-webapp/src/main/webapp/common/error.zul:40 +msgid "Exception type:" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:164 msgid "Unexpected: {0}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:97 -msgid " {0}s" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:112 +msgid "s" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/main.zul:60 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:61 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:50 msgid "Notes" msgstr "" -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:20 -msgid "NavalPlan: Units" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:22 -msgid "NavalPlan: Transfer Projects Between Scenarios" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:224 msgid "Connect" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:220 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:21 +msgid "NavalPlan: Units" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:23 +msgid "NavalPlan: Transfer Projects Between Scenarios" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:221 msgid "Allocation: [{0},{1}]" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:193 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:194 msgid "Changes saved" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1263 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1282 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:337 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:107 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:338 msgid "Progress measurements" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1210 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1211 msgid "Add measure" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java:51 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:469 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:472 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java:52 #: navalplanner-webapp/src/main/webapp/planner/editTask.zul:68 msgid "Subcontract" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:243 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:253 msgid "Work report saved" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:120 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:56 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:40 -msgid "End" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:56 -msgid "Found resources" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29 -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30 msgid "Relationship" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1365 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:52 +msgid "Found resources" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/planner/main.zul:57 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:41 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:121 +msgid "End" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1366 msgid "The date is not valid, the date must be not empty" msgstr "" -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:25 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:26 msgid "User login name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:272 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:317 msgid "Cost Categories" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:267 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:312 msgid "criterion type not specified" msgstr "" -#: navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:22 -msgid "NavalPlan: Companies" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:142 -msgid "must be not empty" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:74 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64 msgid "April" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:69 -msgid "Show all resource assignments" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:143 +msgid "must be not empty" msgstr "" -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:21 +#: navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:23 +msgid "NavalPlan: Companies" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:22 msgid "Users List" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:26 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:54 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:56 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:55 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:57 msgid "Task quality forms" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:526 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:601 msgid "Not working day" 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/ResourceFilterEnum.java:29 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:135 msgid "Cost category" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:688 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:689 msgid "It can not be deleted. At least one sequence is necessary." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java:73 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java:74 msgid "Resource allocation" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:50 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:51 msgid "Amount work" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:170 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:171 msgid "please, select a quality form" msgstr "" @@ -3545,239 +3598,227 @@ msgstr "" msgid "Select entity:" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:399 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:400 msgid "Exist other workReportType with the same code." msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:63 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:64 msgid "Unindent selected task" msgstr "" -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:43 -msgid "Customer reference code" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:61 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:62 msgid "Constraint" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:149 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 +msgid "Customer reference code" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150 msgid "Add New Label Type Field" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:288 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:51 -msgid "Hours Worked Per Resource In A Month" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:155 msgid "Create Exception Day Type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:384 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:333 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:41 +msgid "Hours Worked Per Resource In A Month" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:402 msgid "Time finish cannot be null" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:115 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:116 msgid "Customer reference" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:328 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:148 -#: 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: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 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:758 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:461 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:153 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:329 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:517 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:527 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:662 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:741 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:866 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:916 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:925 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:948 msgid "Information" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:928 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:947 msgid "Sorry, you do not have permissions to access this project" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:491 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:492 msgid "END" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:221 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:223 msgid "Worker saved" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:260 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:261 msgid "can not pass until the previous item is passed." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementModel.java:205 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementModel.java:206 msgid "New hours group " msgstr "" -#: navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:21 +#: navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:22 msgid "NavalPlan: Quality Forms" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:457 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:460 msgid "Assign element to queue manually" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:215 -msgid "Resource: {0} " -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:462 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:463 msgid "percentage cannot be duplicated" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:54 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:216 +msgid "Resource: {0} " +msgstr "" + +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:55 msgid "Edit Template" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:26 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:27 msgid "Heading" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:112 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:114 msgid "finish not later than" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:279 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:324 msgid "Work Hours" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:163 +#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:164 msgid "Company ID already used. It has to be be unique" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:121 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:122 msgid "There is no material category with this code" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java:187 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java:188 msgid "Percentages should sum 100" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:283 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:284 msgid "Could not save machine" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:80 -msgid "Unable to convert value to {0} type" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:334 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:339 msgid "The calendar exception type not found" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:199 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:81 +msgid "Unable to convert value to {0} type" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:220 msgid "Worker must be not-null" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1049 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1067 msgid "Some criterion satisfactions overlap in time" msgstr "" -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:48 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:49 msgid "Value last progress measurement" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:43 msgid "Worker assignments" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:303 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:126 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:153 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:220 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:172 -#: 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:1034 -#, java-format +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:147 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:174 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:402 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:173 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:409 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:431 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:533 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:221 msgid "{0} already exists" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:309 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:314 msgid "Create Worker" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:37 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:38 msgid "Code " msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:41 -msgid "Paper size" -msgstr "" - #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:52 msgid "Password confirmation" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:75 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:88 msgid "Work Report" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:67 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:68 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/java/org/navalplanner/web/common/CustomMenuController.java:323 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:115 msgid "Unit Measures" msgstr "" +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:39 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:63 msgid "Show progress" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:139 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:140 msgid "Work" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:452 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:459 msgid "" "The task has got progress consolidations. It must delete all consolidations " "to change the resource allocation type " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:532 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:120 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:402 -#: navalplanner-webapp/src/main/webapp/common/event_error.zul:21 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:121 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:626 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403 msgid "Error" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:131 msgid "Cost Performance Index" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:128 -msgid "ETC" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:181 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:182 msgid "" "Criterion is not valid, the criterion overlap other criterionSatisfaction " "whith same criterion" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:96 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:129 +msgid "ETC" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:104 msgid "Log out" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:23 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:24 msgid "Add new configuration unit" msgstr "" @@ -3785,181 +3826,171 @@ msgstr "" 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:81 -msgid "Progress consolidation" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:179 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:180 msgid "" "Criterion is not valid, it overlaps other criterionSatisfaction with the " "same criterion" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:163 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationCommand.java:67 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:82 +msgid "Progress consolidation" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:246 msgid "Label type saved" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:418 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:567 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:419 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:568 msgid "missing field name in a description value" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:46 msgid "Add new worker assignment" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:440 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:441 msgid "Show all elements" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:65 -msgid "Limited resource" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:148 +msgid "It couldn't complete all the reassignations" msgstr "" #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:77 msgid "Show dependencies:" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:42 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:66 +msgid "Limited resource" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:27 msgid "Task Information" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:137 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:139 msgid "Hours Group at " msgstr "" -#: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:26 +#: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:27 msgid "Your session has expired after inactivity period. Please log in again." msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:61 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:59 -msgid "Total Estimated hours" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:165 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:190 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:166 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:191 msgid "SPREAD" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:304 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:309 msgid "a day is empty" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:121 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:122 msgid "Budgeted Cost Work Scheduled" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:56 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:57 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:340 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:110 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:341 msgid "Progress measurements: " msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:31 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:32 msgid "Queue Element Information" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:111 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:136 msgid "Start Date" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:31 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 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:22 msgid "Virtual Workers Groups List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 msgid "Cost Variance" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:469 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:470 msgid "criterion type does not allow resource hierarchy" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:136 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:139 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:149 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:89 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:150 msgid "Total" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:47 -msgid "A1" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:221 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:98 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:222 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:99 msgid "Invalidate" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:102 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:103 msgid "Budget hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:162 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:165 msgid "Edit task: {0}" msgstr "" -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:52 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:53 msgid "Select destination" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:528 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:268 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:529 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:269 msgid "must be greater than the previous date." msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:21 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:22 msgid "NavalPlan: Advanced allocation" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1458 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java:551 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1481 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java:583 msgid "Show all" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:44 -msgid "A4" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:37 -msgid "Estimated hours" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:27 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:57 msgid "Default price" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:163 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:38 +msgid "Estimated hours" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:116 msgid "Apply tab changes" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:236 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:246 msgid "passwords don't match" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:71 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:85 +msgid "Day properties" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:72 msgid "Hours groups" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:182 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:183 msgid "Transfer" msgstr "" -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:21 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:22 msgid "Work Hours Types List" msgstr "" @@ -3967,29 +3998,29 @@ msgstr "" msgid "new milestone" msgstr "" -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:46 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:47 msgid "Value last progress reported" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:254 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:299 msgid "Report Progress" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:146 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:154 msgid "Unit {0} cannot be removed because it is used in materials" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:116 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:126 msgid "Create User" 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 "Schedule from start to deadline" msgstr "" -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:49 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:51 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:53 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:50 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:52 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:54 msgid "Estimated days" msgstr "" @@ -3997,15 +4028,15 @@ msgstr "" msgid "Reference date" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:45 msgid "Selected node:" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:73 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:74 msgid "Progress Evolution" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:251 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:252 msgid "Create new project from template" msgstr "" @@ -4013,45 +4044,41 @@ msgstr "" msgid "NavalPlan: Task Scheduling Status In Project" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:111 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:112 msgid "Complete, Partially or Not Scheduled. (Drag and drop to move tasks)" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 -msgid "CV" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:135 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:88 msgid "Original" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:30 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 +msgid "CV" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:31 msgid "Stretches function configuration" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:57 -msgid "Week" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:292 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:306 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:295 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:309 msgid "Not indentable" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:490 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:69 +msgid "Resource allocation type" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:491 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:70 msgid "List of materials for all categories (select one to filter)" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:68 -msgid "Resource allocation type" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:98 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:99 msgid "User disabled" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:573 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:728 msgid "In the available periods {0} only {1} hours are available." msgstr "" @@ -4059,46 +4086,51 @@ msgstr "" msgid "Association with profiles" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:626 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:627 msgid "Task {0} : Duplicate code in DB" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:120 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:25 +#: navalplanner-webapp/src/main/webapp/common/error.zul:30 +msgid "Message - {0}" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:121 msgid "worker's surname not specified" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:210 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:211 msgid "Error on removing workReportType: " msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:47 -#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:41 msgid "Save changes" msgstr "" -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:44 -msgid "Select source" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:191 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:192 msgid "Total dedication" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:668 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:669 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:807 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:45 +msgid "Select source" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:825 msgid "Worker deleted" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:726 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:727 msgid "Select entity, please" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:222 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:293 msgid "Stretch date must not be greater than the task's end date: " msgstr "" @@ -4106,30 +4138,31 @@ msgstr "" msgid "Number of digits:" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:37 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:43 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:38 msgid "Subcontratation date" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:58 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:141 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:93 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:182 msgid "Day" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:150 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:233 msgid "Edit Label Type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:912 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1172 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:349 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:911 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1197 msgid "Please, select an item" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:179 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:180 msgid "Work report type saved" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1123 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1122 msgid "Cannot be higher than finish hour" msgstr "" @@ -4137,12 +4170,12 @@ msgstr "" msgid "Prefix" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:63 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:64 msgid "New Template element" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:55 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:56 msgid "Subcontracted code" msgstr "" @@ -4150,93 +4183,93 @@ msgstr "" msgid "NavalPlan: Hours Worked Per Worker In A Month" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:249 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:320 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:251 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:325 msgid "The base calendar parent not found" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:138 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:141 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:94 msgid "Non Consolidated" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:33 +#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:34 msgid "Reassigning type" msgstr "" -#: 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:295 msgid "Edit Virtual Workers Group" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:438 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:441 msgid "Edit limiting resource element" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:380 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:133 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:156 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:82 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:381 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:157 msgid "Position" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:861 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:862 msgid "The field name must be unique, not null and not empty" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:96 -msgid "Edit work report" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:103 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:104 msgid "Incorrect authentication" msgstr "" +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:112 +msgid "Edit work report" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:42 #: navalplanner-webapp/src/main/webapp/planner/editTask.zul:53 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:41 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:35 msgid "Edit task" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:44 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:45 msgid "Limiting resources (project)" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1173 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1174 msgid "" "Progress measurements that are reported by quality forms can not be removed" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:763 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:764 msgid "A description field of the same name already exists." msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:44 msgid "Current value" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:164 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:165 msgid "Edit Quality Form" msgstr "" -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:79 -msgid "Save and Continue" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:822 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:823 msgid "Duplicate progress assignment for task " msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:51 -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:45 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:48 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:54 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:83 +msgid "Save and Continue" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:46 msgid "Zoom level" msgstr "" -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:27 -#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:159 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:28 msgid "Quality form" msgstr "" -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:97 msgid "Go!" msgstr "" @@ -4244,83 +4277,87 @@ msgstr "" msgid "Profile data" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:271 +msgid "The name of the label is empty." +msgstr "" + +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:31 msgid "Configuration" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeModel.java:98 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeModel.java:99 msgid "It was not possible load entity. Not found. Id: " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:559 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:569 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:864 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:885 msgid "Hours invested" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:158 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:741 +msgid "Project saved" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:160 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:739 -msgid "Project saved" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:44 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:45 msgid "task :" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:702 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:712 msgid "ALL" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:214 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:215 msgid "criterion satisfaction's resource not specified" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:522 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:597 msgid "Derived exception" msgstr "" -#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:21 -msgid "Unit Measures List" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:246 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:291 msgid "Machines" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:179 -msgid "Confirm deleting this profile. Are you sure?" +#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:22 +msgid "Unit Measures List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:152 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:153 msgid "Couldn't find element: {0}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:147 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:222 +msgid "Confirm deleting this profile. Are you sure?" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:148 msgid "You should select a destination scenario" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:184 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:268 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:185 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:269 msgid "unit type code not found" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:41 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:42 msgid "Resource :" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:160 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:180 msgid "Calendar Exception Type saved" msgstr "" -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:39 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:40 msgid "Destination scenario" msgstr "" @@ -4332,36 +4369,36 @@ msgstr "" msgid "NavalPlan: Configuration" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:750 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:751 msgid "Not editable for containing more that an hours group." msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:24 -msgid "Filter by" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:75 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:76 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:45 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:146 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:25 +msgid "Filter by" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java:58 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:147 msgid "Calendar allocation" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:818 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:819 msgid "Duplicate value true report global progress for task" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:111 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:33 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:85 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:32 msgid "Category" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:153 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:154 msgid "must be greater than finish date" msgstr "" @@ -4369,455 +4406,447 @@ msgstr "" msgid "NavalPlan: Materials Needs At Date" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:86 -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:157 -msgid "[generic all workers]" -msgstr "" - #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:26 msgid "Category data" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:94 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:79 +msgid "[generic all workers]" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:103 msgid "Search" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:125 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:126 msgid "Add New Complementary Field" msgstr "" -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:38 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:229 +msgid "Work weeks list" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:39 msgid "Source scenario" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:117 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:118 msgid "%" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:49 -#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:50 +#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:43 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: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:1328 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:139 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:648 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:512 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:256 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:312 #: 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 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1347 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:656 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1548 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1712 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: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 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:69 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:119 -msgid "Resource" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:70 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:71 msgid "Total task hours" msgstr "" -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:45 -msgid "Date last progress reported" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:757 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:29 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:70 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:135 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:79 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:161 +msgid "Resource" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/RedirectorSynthetiser.java:122 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/RedirectorSynthetiser.java:123 msgid "Could not load any resource" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:34 -msgid "Material search" +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:46 +msgid "Date last progress reported" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:289 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:334 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 msgid "Work And Progress Per Project" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:362 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:383 msgid "" "You must allow multiple active criteria for this type to use this assignment " "strategy" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:31 msgid "sub elements" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:157 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:158 msgid "Default Label" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:101 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:155 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:187 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:108 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:85 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:188 msgid "Close" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:465 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:470 msgid "Specific Allocations" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateController.java:117 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:270 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:271 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateController.java:126 msgid "error doing reassignation: {0}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:348 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:349 msgid "Time filter" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:59 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:60 msgid "Move selected task up" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:27 msgid "Select criteria set or specific resources for allocation" msgstr "" +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:34 +msgid "Work Report Lines List" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:316 +msgid "Create copy" +msgstr "" + #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:27 msgid "Company data" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:33 -msgid "Work Report Lines List" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:290 -msgid "Create copy" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:21 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:22 msgid "Criterions Requirement" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:207 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:215 msgid "Unit type code cannot be empty" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:46 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:47 msgid "Average of the estimated hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:159 -msgid "Create Unit Type" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:177 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:239 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:178 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:240 msgid "Quality form saved" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:142 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:167 +msgid "Create Unit Type" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:143 msgid "Label Type fields" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:266 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:311 msgid "Users" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:102 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:103 msgid "Hours Management" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32 msgid "New task:" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:88 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:140 +msgid "Please use some of the compatible browsers: Chrome, Firefox, Safari or Epiphany." +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:94 msgid "specific allocation" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:146 +#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:147 msgid "company name has to be unique. It is already used" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:32 -msgid "" -"Another user has modified the same data, so the operation cannot be safely " -"completed." +#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:33 +msgid "Another user has modified the same data, so the operation cannot be safely completed." msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:73 -msgid "Type of day" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:217 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:231 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:218 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:232 msgid "Template saved" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:576 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:577 msgid "work report have not any description value with this field name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:162 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:172 msgid "User saved" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:46 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47 msgid "Task quality form name" msgstr "" -#: 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 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1097 msgid "Some cost category assignments overlap in time" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:25 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:26 msgid "Imputed hours calculation" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:117 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:119 msgid "FINISH_NOT_LATER_THAN" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:273 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:274 msgid ": code not found" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/error.zul:36 -#: navalplanner-webapp/src/main/webapp/common/event_error.zul:30 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:51 +#: navalplanner-webapp/src/main/webapp/common/error.zul:55 msgid "Exit session" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:30 -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:52 -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:66 -#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineGroupTemplate.java:274 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:53 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:67 msgid "Group" msgstr "" -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:59 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:27 -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:56 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:62 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:59 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28 msgid "Enabled" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:29 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:30 msgid "Statistics list " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:122 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:143 msgid "Edit Exception Day Type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:221 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:222 msgid "All resources must be limiting. " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:326 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:327 msgid "Filter by worker" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/machine/machines.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/machine/machines.zul:22 msgid "NavalPlan: Machines" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:46 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:47 msgid "Load due to current project" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1274 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1286 msgid "You are going to change the assignment function. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:150 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:200 msgid "There must be at least 2 stretches for doing interpolation" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:276 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:321 msgid "Exception Days" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:67 -msgid "Show all labels" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:295 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:296 msgid "Incompatible update: stored resource is not of type: {0}" msgstr "" -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:137 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:82 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:107 -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:38 -#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:41 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:131 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:113 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:97 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:90 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:109 #: 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: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 -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:39 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:132 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:90 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:114 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:98 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:40 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:133 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:132 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:187 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:38 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:42 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:213 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:42 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:137 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:82 msgid "Save & Continue" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:89 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:90 msgid "Scheduling mode" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:22 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:22 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:52 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:54 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:50 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:23 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:55 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:53 msgid "Filter" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:26 msgid "Assigned locations" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:239 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:247 msgid "Unit type saved" msgstr "" -#: 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 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:267 msgid "Two hour costs with the same type overlap in time" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:48 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:63 -msgid "Report progress" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:201 msgid "Create Machine" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:122 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:64 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49 +msgid "Report progress" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:123 msgid "ACWP" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:576 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:731 msgid "The periods available depend on the resource's calendar." msgstr "" -#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:54 +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:55 msgid "START" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:65 -msgid "generic machines allocation" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:310 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:312 msgid "Schedule from the deadline to start" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:467 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:71 +msgid "generic machines allocation" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:470 msgid "Non limiting resource assignation" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:81 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:74 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:86 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:887 +msgid "" +"Deleting this subcontracted project, you are going to lose the relation to " +"report progress. Are you sure?" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:82 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:87 msgid "Back" msgstr "" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:56 msgid "Subcontractor" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:40 -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:32 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:41 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: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:1311 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:631 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:495 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:239 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:293 #: 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 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1330 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:638 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1531 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1694 msgid "must be greater than start date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:92 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:93 msgid "Create Company" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:46 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:47 msgid "Cancel and return" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:33 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:30 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:31 msgid "Assign quality form" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:386 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:202 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:222 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:387 msgid "Delete item {0}. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:49 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:50 msgid "Unit measure name" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:38 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:39 msgid "worked hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:771 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:143 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:773 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:144 msgid "cannot include a progress of the same progress type twice" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:488 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:489 msgid "a work report line has not this label type assigned" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:70 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:106 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:59 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:52 msgid "Allocations" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:52 msgid "Task code" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:49 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132 -msgid "Length" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:84 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:85 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 msgid "Capacity" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:177 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:273 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:50 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:133 +msgid "Length" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:299 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:178 msgid "Create derived" msgstr "" @@ -4825,92 +4854,87 @@ msgstr "" msgid "it must be greater than zero" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:129 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:130 msgid "must be a real positive number" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:110 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:121 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:111 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:122 msgid "Total hours task" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:32 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:33 msgid "No Allocations have been done" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:392 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:409 msgid "Removed calendar \"{0}\"" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1065 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1084 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:23 msgid "Create project" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:106 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:108 msgid "START_IN_FIXED_DATE" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:48 -msgid "" -"Allow multiple values of this type of criterion in the same period of time" +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:49 +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:1299 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1300 msgid "" "The date is not valid, the date must be unique for this progress assignment" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:112 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:113 msgid "Edit Criterion Type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:79 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:81 msgid "as soon as possible" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:426 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:445 msgid "The code cannot be empty." msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 msgid "Human hours per machine working hour within configuration unit" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:112 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:113 msgid "" "Could not add those authorizations to user {0} because they were already " "present." msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:102 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:46 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:47 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:103 msgid "New work report" msgstr "" -#: 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 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:862 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:668 msgid "yes" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:45 -msgid "A3" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:112 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:113 msgid "Select gap" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:62 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:63 msgid "Date Finish" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:223 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:94 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:224 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:95 msgid "Validate" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:142 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:143 msgid "This resource has already been added." msgstr "" @@ -4918,13 +4942,13 @@ msgstr "" msgid "Calendar exception types" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:23 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:34 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:24 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:33 msgid "Cost category assignment" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:149 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:150 msgid "missing code in a hour cost" msgstr "" @@ -4932,63 +4956,64 @@ msgstr "" msgid "All workers" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:221 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:304 msgid "Label saved" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector_combo.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector_combo.zul:25 msgid "Select criteria or resources" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:25 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:23 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:26 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:24 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:24 msgid "Select required criteria set and press filter button" msgstr "" -#: 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/externalcompanies/ExternalCompanyCRUDController.java:229 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:231 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:233 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:280 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:380 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:135 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:311 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1019 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1280 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:115 #: 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 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:232 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:945 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1204 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:44 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:42 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:43 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:49 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:82 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:86 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:38 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:48 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:127 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:46 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:43 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:72 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:95 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:732 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:42 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:48 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:44 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:50 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:84 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:88 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:43 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:53 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:43 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:54 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:72 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:128 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:47 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:93 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:43 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:63 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:33 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:37 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:44 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:40 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:134 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:32 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:93 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:41 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:42 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:48 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:39 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:52 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:39 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:135 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:44 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:42 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:42 msgid "cannot be null or empty" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:631 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:632 msgid "Hours Group {0} : Duplicate code in DB" msgstr "" @@ -4996,30 +5021,30 @@ msgstr "" msgid "NavalPlan: Work And Progress Per Project" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:51 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:60 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:43 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:52 msgid "New code" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java:90 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java:91 msgid "The progress type cannot be modified" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:441 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:412 msgid "Calculate Resources per Day" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:995 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:996 msgid "The index fields and labels must be uniques and consecutives" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:249 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:250 msgid "" "Are you sure of changing the resource type? You will lose the criterions " "with different resource type." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:129 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130 msgid "Estimate To Complete" msgstr "" @@ -5027,113 +5052,123 @@ msgstr "" msgid "NavalPlan: Estimated/Planned Hours Per Task" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:29 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:109 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:30 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:84 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:29 msgid "Unit type" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:41 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:42 msgid "Load due to other assignments" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:61 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:62 msgid "Sum of all task leafs imputed hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:638 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:644 msgid "This machine was already removed by other user" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:25 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:26 msgid "Calendar data" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:248 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:293 msgid "Work Reports" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:168 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:173 msgid "login name is already being used by another user" msgstr "" -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:21 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:22 msgid "Cost Categories List" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:108 +#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:109 msgid "code is already used" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:151 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:152 msgid "Criterion Requirements" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:128 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:143 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:176 -msgid "Workable Time" +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:148 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:185 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:212 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:65 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34 +msgid "Extra Effort" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:55 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:260 +msgid "Already exists other label with the same name" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:56 msgid "Move selected task down" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:134 +msgid "The admin's account password remains the default one. This is unsecure" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:32 msgid "Customer Reference" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/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 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:778 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:147 msgid "spread values are not valid, at least one value should be true" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:88 -msgid "Create and assign label" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:41 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:42 msgid "Optimistic" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 -msgid "SV" +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:89 +msgid "Create and assign label" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1460 -msgid "Filter work reports" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 +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/calendars/BaseCalendarCRUDController.java:369 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1483 +msgid "Filter work reports" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:395 msgid "" "Default calendar cannot be removed. Please, change the default calendar in " "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 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:587 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:884 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:319 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:63 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:46 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:49 msgid "Progress" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:127 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:128 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:1220 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1221 msgid "All progress types have already been assigned." msgstr "" @@ -5141,124 +5176,124 @@ msgstr "" msgid "Price per hour" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:208 -msgid "Project: {0} " -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:269 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:314 msgid "Calendars" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/page_not_found.zul:20 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:209 +msgid "Project: {0} " +msgstr "" + +#: navalplanner-webapp/src/main/webapp/common/page_not_found.zul:21 msgid "NavalPlan: Page not found" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:337 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:355 msgid "The date cannot be null" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:315 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:316 msgid "" "Another task in the same branch is already reporting progress for this " "quality form" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:32 msgid "Show only current satisfied criteria" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:91 -msgid "Latest date" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:372 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:392 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:211 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:231 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:373 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:393 msgid "Error on showing delete confirm" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:688 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92 +msgid "Latest date" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:671 msgid "Sum of all rows" msgstr "" -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:87 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:88 msgid "Group by weeks" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:72 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:82 msgid "Finish hour" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:175 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:199 msgid "Done {0} of {1}" msgstr "" -#: navalplanner-webapp/src/main/webapp/users/users.zul:22 +#: navalplanner-webapp/src/main/webapp/users/users.zul:23 msgid "NavalPlan: Accounts" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:140 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:23 +msgid "NavalPlan: Scenarios Management" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:194 msgid "" "Last stretch should have one hundred percent for length and amount of work " "percentage" msgstr "" -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:22 -msgid "NavalPlan: Scenarios Management" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:100 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:79 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 msgid "Filter by projects" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:22 -msgid "Criteria of selected type " -msgstr "" - -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32 msgid "Each worker configuration unit name" 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/resources/criterions/_criterionsTree.zul:23 +msgid "Criteria of selected type " +msgstr "" + +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:42 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:224 msgid "Active" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1257 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1258 msgid "This progress measurement can not be in " msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:29 msgid "Inherited labels" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1242 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1243 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:909 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:289 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:292 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:910 msgid "Unindent" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:931 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1389 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:932 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1390 msgid "Value is not valid, the current value must be not empty" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:49 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:50 msgid "Direct labels" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:91 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:92 msgid "Log in" msgstr "" @@ -5266,94 +5301,94 @@ msgstr "" msgid "Project name" msgstr "" -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:52 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:53 msgid "Precision" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:371 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:372 msgid "missing code in a work report line" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:77 -msgid "Show all reported hours" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:21 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:22 msgid "NavalPlan: Subcontracted Tasks" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:984 +msgid "Efforts" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:41 +msgid "Show all reported hours" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:102 msgid "Projects List" msgstr "" -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:51 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:50 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:48 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:74 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:52 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:45 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:79 -#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:45 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:136 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:57 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:74 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:49 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:60 -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:43 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:42 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:54 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:44 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:65 +#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:45 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:80 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:58 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:137 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43 msgid "Generate code" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:109 -msgid "Scheduling state" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:368 -msgid "This template can not be removed because it has applications." -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:482 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:483 msgid "The code sequence is already in use and it can not be updated." msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:27 -msgid "Select print page properties" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:110 +msgid "Scheduling state" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:369 +msgid "This template can not be removed because it has applications." msgstr "" #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21 msgid "NavalPlan: Project Costs Per Resource" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:205 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:206 msgid "criterion satisfaction's criterion not specified" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java:162 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java:163 msgid "Number of iterations should be between 1 and " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:126 msgid "Scenarios must be enabled as more elements than master exist" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/error.zul:35 -#: navalplanner-webapp/src/main/webapp/common/event_error.zul:29 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:50 +#: navalplanner-webapp/src/main/webapp/common/error.zul:54 msgid "Reload" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:557 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:613 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:558 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:614 msgid "Task {0} : Task group is incompatible type with {1}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:247 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:292 msgid "Virtual Workers Groups" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:25 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:26 msgid "Profiles authorization" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:87 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:71 msgid "Assignation" msgstr "" @@ -5361,112 +5396,119 @@ msgstr "" msgid "Planning charts expanded" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:430 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:431 msgid "Not deletable" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:165 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:189 msgid "Doing {0} reassignations" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:47 +#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:48 msgid "code not specified" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:21 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:22 msgid "Projects list" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:189 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:190 msgid "" "Cannot delete work report type. There are some work reports bound to it." msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:22 msgid "Criterion Type List" 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:737 msgid "Overall progress" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:50 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:51 msgid "Create template from selected task" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:118 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:119 msgid "All projects" msgstr "" #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:47 -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:78 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:79 msgid "Password" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:88 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:89 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:36 msgid "Observations" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:944 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:963 msgid "Edit project" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:26 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:23 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:24 msgid "Progress assignments" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:186 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:206 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:230 -#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:26 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:27 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:244 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:263 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:285 msgid "Valid from" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:56 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:69 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:59 msgid "Month" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:204 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:206 msgid "exception date already exists" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:303 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:308 msgid "There exists other template with the same name." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:747 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:863 +msgid "{0} could not be allocated. Cannot allocate more than one resource" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:758 msgid "Advanced assignment saved" msgstr "" -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:54 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:30 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:55 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31 msgid "Color" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:365 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:366 msgid "Cannot insert material in general view. Please, select a category" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:192 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:193 msgid "criterion satisfaction's start date not specified" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:50 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:132 -#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:371 +msgid "Only {0} resources per day were achieved for current allocation" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:51 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:83 #: navalplanner-webapp/src/main/webapp/planner/editTask.zul:79 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:65 -#: 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: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/planner/main.zul:66 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:39 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:43 +#: 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/reassign.zul:48 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:133 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:79 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:97 msgid "Accept" msgstr "" @@ -5474,241 +5516,242 @@ msgstr "" msgid "Example: {0}" msgstr "" -#: 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 +#: 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:303 +#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:40 msgid "Edit Worker" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:457 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:458 msgid "" "Create new material assignment out of material assignment {0}. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:192 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:151 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:167 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:193 msgid "Work report lines" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:48 msgid "Calculated" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:117 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:118 msgid "Error setting up edition form for Criterion Type with id: {0}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:210 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:211 msgid "Completed: {0}% " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1177 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1178 msgid "Calculated progress measurement can not be removed" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:334 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:340 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:335 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:341 msgid " The " msgstr "" -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:50 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:51 msgid "Access to the system" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:207 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:190 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:114 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:104 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:199 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160 -#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:44 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182 msgid "Click on " msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:60 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:61 msgid "Probability" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:111 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:99 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:115 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:112 msgid "Report data" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:43 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:44 msgid "External load" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:202 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:204 msgid "Progress sent successfully" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:89 -msgid "Priority" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:36 -msgid "Landscape" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/InstanceNotFoundRecoverableErrorException.java:45 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/InstanceNotFoundRecoverableErrorException.java:46 msgid "instance not found" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:424 -msgid "criterion names must be unique inside a criterion type" +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:73 +msgid "Priority" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:30 -msgid "Filters" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:207 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:69 +msgid "Infinitely Over Assignable" 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: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 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:27 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:84 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:43 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:69 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:25 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:95 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:98 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:425 +msgid "criterion names must be unique inside a criterion " +"type" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:79 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:814 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:120 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:90 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:95 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:99 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:25 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:47 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:76 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:27 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:39 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:76 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:39 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:75 -#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:40 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:28 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:107 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:27 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:64 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:131 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:51 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:65 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:75 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:69 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:46 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:37 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:59 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:81 -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:35 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:36 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:49 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:144 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:232 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:36 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:59 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:186 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:287 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:26 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:85 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:66 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:76 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:49 +#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:40 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:114 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:76 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:26 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:52 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:65 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:132 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:37 msgid "Code" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:40 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:41 msgid "Add stretch" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:86 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:70 msgid "Assignation type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:416 -msgid "Calculate Workable Days" +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:33 +msgid "Show resource assignments" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:213 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:240 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:241 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:214 msgid "" "Start date is not valid, the new start date must be lower than the end date" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:54 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:52 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:96 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:387 +msgid "Calculate Workable Days" +msgstr "" + #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:121 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:96 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:57 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:100 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:55 msgid "Start date" msgstr "" -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:157 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:168 msgid "Update exception" msgstr "" +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:138 +msgid "Budget" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/TreeElementOperationsController.java:253 msgid "Operation cannot be done" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:137 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 -msgid "Budget" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:329 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:330 msgid "Already exists other criterion with the same name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:75 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:65 msgid "May" msgstr "" -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:36 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:37 msgid "Unit name" msgstr "" -#: navalplanner-webapp/src/main/webapp/labels/labelTypes.zul:20 +#: navalplanner-webapp/src/main/webapp/labels/labelTypes.zul:21 msgid "NavalPlan: Labels" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:46 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:51 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java:44 -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:34 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:42 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:43 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48 msgid "Project code" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:56 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:57 msgid "Write" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:38 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:39 msgid "Number of applications" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:496 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:499 msgid "Assign element to queue automatically" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:81 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:82 msgid "" "Date which the task must start after (press enter in textbox to open " "calendar popup or type in date directly)" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:295 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:529 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:42 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:326 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:604 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:43 msgid "Normal" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:296 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:312 msgid "Date cannot be null" msgstr "" -#: 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/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:765 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:49 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:168 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:70 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:126 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:68 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:76 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:142 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:169 msgid "Task Code" msgstr "" @@ -5716,348 +5759,338 @@ msgstr "" msgid "Project view" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:94 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:96 msgid "Create Profile" msgstr "" -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:50 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:52 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:54 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:51 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:53 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:55 msgid "Probability %" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:746 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:747 msgid "This label type already is assigned to the work report type." msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:26 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:27 msgid "New criterion" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:597 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:348 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:541 -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:48 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:349 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:735 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:542 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49 msgid "Load" msgstr "" -#: 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 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:889 #: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:65 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:119 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:58 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:60 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:82 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:46 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:47 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:32 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:41 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:120 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:59 msgid "Description" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:71 -msgid "Expand all taskgroups" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:23 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:24 msgid "NavalPlan: Criteria" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:164 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:117 msgid "Go to advanced Allocation" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:282 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:242 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:283 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:287 msgid "Project Templates" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:621 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:623 msgid "already exists an allocation for criteria {0}" 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 "Forward" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:42 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:43 msgid "Number of finished applications" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:464 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:465 msgid "Invalid queue element" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:574 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:583 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:591 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:575 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:584 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:592 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 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:70 msgid "User" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:256 -msgid "Virtual worker" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403 +msgid "At least one HoursGroup is needed" msgstr "" #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:69 msgid "Interacts with applications" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:330 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:257 +msgid "Virtual worker" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:343 msgid "Length percentage should be between 0 and 100" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:47 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:48 msgid "Multiple values per resource" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:35 msgid "Hours:" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:57 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:63 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:62 msgid "Split" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:100 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:104 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:105 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:105 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:106 msgid "please, select a project" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:117 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:118 msgid "Supported Chrome, Firefox, Safari and Epiphany browsers" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:40 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:27 -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:32 -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:67 -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:24 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:42 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:93 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:33 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:68 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:41 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:50 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:29 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:94 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:45 msgid "Starting date" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:33 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:64 +msgid "Add materials" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:34 msgid "Load 100%" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:979 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:990 msgid "Function" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:198 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:160 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:187 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:168 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:92 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:141 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:82 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:179 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:198 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:139 -#: navalplanner-webapp/src/main/webapp/reports/resourcesListReport.zul:25 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:160 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:585 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:541 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:606 msgid "New project version" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:166 -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:81 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:530 -#: 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 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:36 -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:24 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:47 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:46 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:41 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:26 -#: 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: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 -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:23 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:46 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:24 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:47 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:43 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:332 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:77 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:474 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1250 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:472 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:532 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:44 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:37 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:42 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:37 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:33 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:24 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:47 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:48 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:104 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:37 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:78 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:25 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:39 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:35 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:25 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:49 msgid "Edit" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:35 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:174 +msgid "Edit Unit Type" +msgstr "" + #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 msgid "Init date" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:103 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:104 msgid "Responsible" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:456 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:457 msgid "percentage must be in range (0,100]" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:52 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:61 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:44 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:53 msgid "New Description" msgstr "" -#: 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" +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1154 +msgid "resources cost category assignment codes must be " +"unique inside a resource" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:159 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:162 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:160 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:164 msgid "XML" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:186 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:187 msgid "" "CriterionType is not valid, the criterionType overlap other " "criterionSatisfaction whith same criterionType" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:60 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:61 msgid "Unable to convert {0} value to {1} type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:197 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:198 msgid "Tree {0} sucessfully flattened" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:110 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:31 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:83 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:30 msgid "Unit price" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:68 -msgid "Project Code" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46 msgid "Communication date" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:29 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:68 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:72 +msgid "Project Code" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:30 msgid "Reassigning" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:519 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:588 msgid "" "Cannot delete that cost category because there are resources assigned to it." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:595 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:596 msgid "{0} already assigned to resource allocation list" msgstr "" -#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:26 +#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:27 msgid "Unit Measure" msgstr "" -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:21 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:22 msgid "Label Types List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:414 -msgid "The type of hours cannot be null." -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:343 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:347 msgid "{0} projects reassignation remaining" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:51 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:52 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionBandboxFinder.java:44 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:50 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:48 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:46 -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:58 -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:35 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:24 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:41 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:26 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:51 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:148 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:117 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:157 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:137 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:178 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:99 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:140 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:95 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:125 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:165 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:107 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:148 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:77 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:46 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:152 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:41 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:41 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:63 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:127 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:42 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:196 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:42 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:46 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:98 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:232 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:25 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:36 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:33 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:48 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:42 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:64 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:128 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:59 msgid "Type" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_contentOverallProgress.zul:59 -msgid "Refresh" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:631 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:637 msgid "" "This machine cannot be deleted because it has assignments to projects or " "imputed hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:81 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:71 msgid "November" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:121 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:122 msgid "BCWS" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1287 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1309 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1288 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1310 msgid "" "Value is not valid, the value must be greater than the value of the previous " "progress." @@ -6067,118 +6100,124 @@ msgstr "" msgid " in the specified directory." msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1130 -msgid "criterion satisfaction codes must be unique inside a resource" +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1148 +msgid "criterion satisfaction codes must be unique inside " +"a resource" msgstr "" -#: 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 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:862 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:668 msgid "no" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:359 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:360 msgid "missing code in a work report." 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/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/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:29 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:29 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:36 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:85 msgid "Criterion" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:94 +msgid "unl" +msgstr "" + #: navalplanner-webapp/src/main/webapp/common/configuration.zul:76 msgid "Generate code for" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/impl/LabelConverter.java:102 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:396 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:480 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/impl/LabelConverter.java:103 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:397 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:481 msgid "missing code in a label" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:122 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:123 msgid "Actual Cost Work Performed" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:182 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:184 msgid "Create project from Template" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:265 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:310 msgid "NavalPlan Configuration" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:50 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:51 msgid "Average of the worked hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:405 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:406 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" " and should not be empty" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorization.java:42 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorization.java:43 msgid "an authorization type must be set" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:91 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:92 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:584 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:540 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:605 msgid "" "Confirm creating a new project version for this scenario and derived. Are " "you sure?" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:149 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:77 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:113 -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:28 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:29 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:167 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:88 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:129 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:85 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:115 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:154 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:86 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:150 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:96 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:137 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:86 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:77 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:146 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:167 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:88 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:165 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:88 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:129 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:68 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:29 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:44 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:74 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:66 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:59 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166 msgid "Add" msgstr "" #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:124 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:73 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:85 msgid "Unselect" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:543 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:618 msgid "You should select the type of exception" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:92 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:45 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:98 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:93 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:56 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:30 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:51 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:99 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 msgid "Deadline" msgstr "" @@ -6186,66 +6225,62 @@ msgstr "" msgid "Filter by categories or materials" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:253 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:298 msgid "Subcontracted Tasks" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:369 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:389 msgid "Amount work percentage should be between 0 and 100" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:29 msgid "Machine data" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:127 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:128 msgid "VAC" msgstr "" -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:27 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:33 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:54 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:55 msgid "Label type" msgstr "" -#: 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 "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:264 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:309 msgid "Administration / Management" msgstr "" -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:92 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:246 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:319 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:243 +msgid "Advanced Allocation" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:93 msgid "Number of iterations" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:59 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:60 msgid "Template Tree" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:326 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:329 msgid "Criterion has subelements" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:527 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:33 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:499 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:34 msgid "Alpha" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:162 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:203 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:163 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:204 msgid "inconsistent parent code." msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:67 -msgid "Recommended Allocation" -msgstr "" - #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:67 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:33 msgid "Status" msgstr "" @@ -6253,61 +6288,59 @@ msgstr "" 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: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: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 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:49 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:88 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:53 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:47 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:128 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:33 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:73 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:82 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:70 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:806 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:62 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:69 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:76 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:34 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:54 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:72 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:37 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:154 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:35 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:84 msgid "Hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:630 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:768 msgid "the date must be inside the visualization area" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:404 -msgid "work report has not this label type assigned" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1220 -msgid "Limiting assignment" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:521 -msgid "date not specified." -msgstr "" - -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:53 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:54 msgid "Quality form type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:343 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:405 +msgid "work report has not this label type assigned" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1229 +msgid "Limiting assignment" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:522 +msgid "date not specified." +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:344 msgid "The name of the criterion is empty." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:359 -msgid " hours" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:133 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:146 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:241 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:147 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:281 msgid "Limiting Resources Planning" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:769 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:360 +msgid " hours" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:770 msgid "The max value must be not empty" msgstr "" @@ -6315,628 +6348,217 @@ msgstr "" msgid "New label" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:133 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:134 msgid "Worker ID cannot be empty" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:342 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:351 -msgid "The start date cannot be null" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:176 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:177 msgid "All project tasks" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:77 -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:72 -msgid "Allocation configuration" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:352 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:343 +msgid "The start date cannot be null" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:124 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:125 msgid "Scenario \"{0}\" saved" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:214 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:173 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:27 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:78 +msgid "Allocation configuration" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:189 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:215 msgid "Save & New work report" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:51 -msgid "Subcontract price" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:147 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:148 msgid "" "Some entity sequence was created during the configuration process, it is " "impossible to update entity sequence table. Please, try again later" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:584 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:52 +msgid "Subcontract price" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:739 msgid "Resources per day are zero" 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 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:30 msgid "Assigned criteria" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:52 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:53 msgid "Help on authentication (opens a new window)" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:869 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/EffortDurationBox.java:39 +msgid "Not a valid effort duration" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:870 msgid "The length must be greater than 0, and not null." msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:65 -msgid "2011" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:504 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:536 msgid "Could not save new calendar" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1384 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1404 msgid "Sigmoid function applied to current resource" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:152 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:160 msgid "Deleted unit type {0}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:224 msgid "Could not save the scenario" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:135 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:136 msgid "Couldn't find criterion {0}" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:32 -#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:36 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:37 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:33 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:35 msgid "Apply filtering to tasks satisfying required criteria" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:293 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:338 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41 msgid "Task Scheduling Status In Project" 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 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:421 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:194 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:345 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:373 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:356 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:888 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:200 msgid "Confirm" msgstr "" -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:48 -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:44 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:47 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:32 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:44 -#: 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: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 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:59 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:56 -#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:31 -#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:31 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:57 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:48 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:55 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:43 +#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:32 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:58 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:32 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:32 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:56 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:33 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:47 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:49 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:61 msgid "Create" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1705 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1711 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1728 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1734 msgid "please, select a work report type" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:43 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67 msgid "Permissions" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:485 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:486 msgid "List of materials for category: {0}" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:32 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:31 msgid "Total price" msgstr "" -#: 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: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: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: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 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:291 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:125 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:711 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:971 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1220 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:377 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:90 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:120 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:39 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:66 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:41 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:90 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:54 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:52 -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:87 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:51 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:89 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:68 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:116 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:131 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:44 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:106 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:147 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:188 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:109 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:150 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:135 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:175 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:107 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:232 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:126 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:362 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:530 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:544 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:163 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:818 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:625 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:138 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:324 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:948 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:954 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:271 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:292 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:787 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1045 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1296 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:419 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:408 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:694 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1266 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:388 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:332 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:405 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1204 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1230 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1242 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:436 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:223 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:117 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:158 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:127 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:106 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:147 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:188 #: navalplanner-webapp/src/main/webapp/reports/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 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:78 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:66 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:60 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:83 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:42 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:109 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:150 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:49 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:92 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:46 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:88 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:69 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:117 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:132 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:104 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:114 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:51 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:52 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:48 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:115 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:53 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:59 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:213 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:84 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:40 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:90 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:120 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:66 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:54 msgid "Delete" msgstr "" - -#: 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: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: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: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: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:175 -msgid "" -"There are no days available at resource's calendar in the days marked " -"available by the task's calendar." -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:27 -msgid "Finished" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:28 -msgid "In progress" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:29 -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31 -msgid "Pending" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:30 -msgid "Blocked" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31 -msgid "Failed sent" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:32 -msgid "Success sent" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AssignmentFunction.java:57 -msgid "None" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AssignmentFunction.java:58 -msgid "Stretches" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AssignmentFunction.java:59 -msgid "Interporlation" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AssignmentFunction.java:60 -msgid "Sigmoid" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueDependency.java:169 -msgid "A queue dependency has to have an origin different from destiny" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/QueuePosition.java:52 -msgid "Hour should be a value between 0 and 23" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:33 -msgid "Web service reader" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:34 -msgid "Web service writer" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:35 -msgid "All projects read allowed" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:36 -msgid "All projects edition allowed" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:37 -msgid "Project creation allowed" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:32 -msgid "Read authorization" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:33 -msgid "Write authorization" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java:121 -msgid "Line" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:34 -msgid "WORK_RELATIONSHIP" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:40 -msgid "LOCATION_GROUP" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:47 -msgid "MACHINE LOCATION_GROUP" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:55 -msgid "LEAVE" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:61 -msgid "TRAINING" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:67 -msgid "JOB" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:73 -msgid "CATEGORY" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:31 -msgid "WORKER" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:32 -msgid "MACHINE" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:161 -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 "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ProgressType.java:36 -msgid "Progress with critical path tasks by hours" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ProgressType.java:37 -msgid "Progress with critical path tasks by duration" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/EntitySequence.java:89 -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/EntitySequence.java:130 -msgid "You can not modifiy this order sequence, it is already in use" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/EntitySequence.java:139 -#, java-format -msgid "number of digits must be between {0} and {1}" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/daos/EntitySequenceDAO.java:81 -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:893 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:653 -msgid "Cannot spread two progress in the same task" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:168 -#, java-format -msgid "{0} is already child of another {1}" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:214 -msgid "it's already somewhat scheduled" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:228 -msgid "it can't be unscheduled" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:366 -msgid "Completely scheduled" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:368 -msgid "Partially scheduled" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:370 -msgid "Unscheduled" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:376 -msgid "C" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:378 -msgid "P" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:380 -msgid "U" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 -msgid "OFFERED" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 -msgid "ACCEPTED" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 -msgid "STARTED" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 -msgid "FINISHED" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 -msgid "CANCELLED" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 -msgid "SUBCONTRACTED PENDING PROJECT" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 -msgid "STORED" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:574 -msgid "" -"Some ancestor has the same label assigned, so this element is already " -"inheriting this label" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:677 -#: 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: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 "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:259 -msgid "workHours should be greater or equals to 0" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:271 -msgid "" -"\"workHours\" value is not valid, taking into account the current list of " -"HoursGroup" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:180 -msgid "Working hours shouldn't be negative" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:209 -msgid "Total percentage should be less than 100%" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:258 -#, java-format -msgid "" -" The criterion {0} can not be assigned to this hoursGroup because its " -"resource type is diferent." -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:264 -#, java-format -msgid "" -" The criterion {0} can not be assigned to this hoursGroup because it " -"already exist into the hoursGroup." -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:420 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:430 -#, java-format -msgid "Repeated Hours Group code {0} in Project {1}" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java:539 -#, java-format -msgid " The {0} already exist into other task" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:30 -msgid "Number of assigned hours" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:31 -msgid "Number of hours calculated by clock" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:32 -msgid "Number of assigned hours and the time" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:33 -msgid "heading" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:33 -msgid "line" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/scenarios/entities/Scenario.java:175 -#, java-format -msgid "Derived from {0}" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:31 -msgid "RECEIVED" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:32 -msgid "PENDING" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:33 -msgid "ORDERED" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:34 -msgid "PROCESSING" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:35 -msgid "CANCELED" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/QualityFormType.java:28 -msgid "by percentage" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/QualityFormType.java:28 -msgid "by items" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java:119 -msgid "Yes" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java:119 -msgid "No" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java:81 -msgid "Monday" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java:81 -msgid "Tuesday" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java:81 -msgid "Wednesday" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java:82 -msgid "Thursday" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java:82 -msgid "Friday" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java:82 -msgid "Saturday" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java:83 -msgid "Sunday" -msgstr "" diff --git a/navalplanner-webapp/src/main/webapp/common/layout/login.zul b/navalplanner-webapp/src/main/webapp/common/layout/login.zul index 99fd0075f..6af9e9ff0 100644 --- a/navalplanner-webapp/src/main/webapp/common/layout/login.zul +++ b/navalplanner-webapp/src/main/webapp/common/layout/login.zul @@ -136,7 +136,7 @@ function checkbrowser() { document.getElementById("supported-browsers-box").setAttribute("class", "supported-browsers not-supported"); alertString = "${i18n:_('The browser you are using')}"; alertString += " ("+navigator.appName+") "; - alertString += "${i18n:_('is not supported for his use with NavalPlan.')}"; + alertString += "${i18n:_('is not supported for its use with NavalPlan.')}"; alertString += "${i18n:_('Please use some of the compatible browsers: Chrome, Firefox, Safari or Epiphany.')}"; window.alert(alertString); } @@ -145,4 +145,4 @@ function checkbrowser() { document.onload = checkbrowser(); ]]> - \ No newline at end of file + diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template.zul b/navalplanner-webapp/src/main/webapp/common/layout/template.zul index 2defa2230..ba094a61f 100644 --- a/navalplanner-webapp/src/main/webapp/common/layout/template.zul +++ b/navalplanner-webapp/src/main/webapp/common/layout/template.zul @@ -131,7 +131,7 @@ signature="java.lang.Boolean isDefaultPasswordsControl()"?> class="footer-messages-area" style="display:${templateCtrl.defaultPasswdAdminVisible}">
- ${i18n:_('The admin\'s account password remains the default one. This is unsecure')}. + ${i18n:_("The admin's account password remains the default one. This is unsecure")}. [${i18n:_('Change the password')}]
diff --git a/navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul b/navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul index 4f31f6c3c..7fa3bcc44 100644 --- a/navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul +++ b/navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul @@ -51,8 +51,8 @@