From b6590e691a2d978db1280e4571e191de575cc0dd Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Mon, 21 Feb 2011 18:50:42 +0100
Subject: [PATCH] [Bug #879] Using inherited instead of indirect for criteria
 and labels.

FEA: ItEr71S04BugFixing
---
 .../navalplanner/web/orders/CriterionRequirementWrapper.java  | 2 +-
 .../main/webapp/orders/components/_listOrderElementLabels.zul | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java
index 2b8119005..c31b0b0a9 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java
@@ -45,7 +45,7 @@ public class CriterionRequirementWrapper  implements INewObject {
     public final String DIRECT = _("Direct");
 
     public static String getIndirectTypeLabel() {
-        return _("Indirect");
+        return _("Inherited");
     }
 
     private String type;
diff --git a/navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul b/navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul
index f41791a6a..6366f1ebf 100644
--- a/navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul
@@ -24,9 +24,9 @@
 ]]>
 </zscript>
 <vbox apply="${assignedLabelsController}" width="100%">
-    <!-- Indirect labels -->
+    <!-- Inherited labels -->
     <vbox width="100%">
-        <panel title="${i18n:_('Indirect labels')}" border="normal">
+        <panel title="${i18n:_('Inherited labels')}" border="normal">
             <panelchildren>
                 <grid id="inheritedLabels" height="150px" fixedLayout="true"
                     model="@{assignedLabelsController.inheritedLabels}">