From 1f34a41d0de1dd645801ec8c0d35606937ee1268 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Wed, 4 Jul 2012 16:42:18 +0200
Subject: [PATCH] i18n: Fixing some English strings

FEA: ItEr76S04BugFixing
---
 .../business/advance/entities/AdvanceAssignment.java      | 2 +-
 .../business/advance/entities/AdvanceMeasurement.java     | 2 +-
 .../libreplan/business/advance/entities/AdvanceType.java  | 8 ++++----
 .../advance/entities/DirectAdvanceAssignment.java         | 4 ++--
 .../business/costcategories/entities/HourCost.java        | 2 +-
 .../business/expensesheet/entities/ExpenseSheetLine.java  | 2 +-
 .../externalcompanies/entities/CustomerCommunication.java | 2 +-
 .../org/libreplan/business/orders/entities/Order.java     | 8 ++++----
 .../libreplan/business/orders/entities/OrderElement.java  | 2 +-
 .../business/orders/entities/OrderLineGroup.java          | 2 +-
 .../org/libreplan/business/planner/entities/Task.java     | 2 +-
 .../libreplan/business/planner/entities/TaskGroup.java    | 2 +-
 .../business/qualityforms/entities/QualityForm.java       | 4 ++--
 .../business/qualityforms/entities/TaskQualityForm.java   | 4 ++--
 .../entities/MachineWorkersConfigurationUnit.java         | 2 +-
 .../business/workreports/entities/WorkReport.java         | 2 +-
 .../business/workreports/entities/WorkReportLine.java     | 2 +-
 .../web/costcategories/CostCategoryCRUDController.java    | 2 +-
 .../ResourcesCostCategoryAssignmentController.java        | 2 +-
 .../org/libreplan/web/orders/OrderCRUDController.java     | 2 +-
 .../libreplan/web/orders/OrderElementTreeController.java  | 2 +-
 .../org/libreplan/web/orders/OrdersTreeComponent.java     | 2 +-
 .../libreplan/web/orders/ProjectDetailsController.java    | 2 +-
 .../web/planner/company/CompanyPlanningController.java    | 2 +-
 .../web/planner/order/OrderPlanningController.java        | 2 +-
 .../web/reports/OrderCostsPerResourceController.java      | 4 ++--
 .../web/resources/machine/MachineCRUDController.java      | 2 +-
 .../web/resources/worker/WorkerCRUDController.java        | 2 +-
 .../web/workreports/WorkReportCRUDController.java         | 2 +-
 .../web/workreports/WorkReportQueryController.java        | 2 +-
 .../src/main/webapp/costcategories/_editCostCategory.zul  | 2 +-
 .../main/webapp/excetiondays/_listExceptionDayTypes.zul   | 2 +-
 .../src/main/webapp/resources/_costCategoryAssignment.zul | 2 +-
 .../src/main/webapp/unittypes/_editUnitType.zul           | 2 +-
 .../src/main/webapp/unittypes/_listUnitTypes.zul          | 4 ++--
 35 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceAssignment.java b/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceAssignment.java
index c22695b04..a4d3e21be 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceAssignment.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceAssignment.java
@@ -72,7 +72,7 @@ public abstract class AdvanceAssignment extends BaseEntity {
         }
     }
 
-    @NotNull(message = "advance type not specified")
+    @NotNull(message = "progress type not specified")
     public AdvanceType getAdvanceType() {
         return this.advanceType;
     }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceMeasurement.java b/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceMeasurement.java
index 1dca5b249..ae25d27e3 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceMeasurement.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceMeasurement.java
@@ -108,7 +108,7 @@ public class AdvanceMeasurement extends BaseEntity {
         this.advanceAssignment = advanceAssignment;
     }
 
-    @NotNull(message = "advance assignment not specified")
+    @NotNull(message = "progress assignment not specified")
     public AdvanceAssignment getAdvanceAssignment() {
         return this.advanceAssignment;
     }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java b/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java
index d02eb0abc..74f476ea4 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java
@@ -216,7 +216,7 @@ public class AdvanceType extends BaseEntity implements IHumanIdentifiable{
         this.qualityForm = BooleanUtils.toBoolean(qualityForm);
     }
 
-    @AssertTrue(message = "advance type marked as quality form but is updatable")
+    @AssertTrue(message = "progress type marked as quality form but is updatable")
     public boolean checkConstraintIfIsQualityFormIsNotUpdatable() {
         if (isQualityForm()) {
             if (isUpdatable()) {
@@ -226,7 +226,7 @@ public class AdvanceType extends BaseEntity implements IHumanIdentifiable{
         return true;
     }
 
-    @AssertTrue(message = "default max value of percentage advance type must be 100")
+    @AssertTrue(message = "default maximum value of percentage progress type must be 100")
     public boolean checkConstraintDefaultMaxValueMustBe100ForPercentage() {
         if (percentage) {
             if (defaultMaxValue.compareTo(new BigDecimal(100)) != 0) {
@@ -241,7 +241,7 @@ public class AdvanceType extends BaseEntity implements IHumanIdentifiable{
         return unitName;
     }
 
-    @AssertTrue(message = "Advance Type name already used. It must be unique")
+    @AssertTrue(message = "progress type name is already in use")
     public boolean checkConstraintUniqueName() {
         if (StringUtils.isBlank(unitName)) {
             return true;
@@ -263,7 +263,7 @@ public class AdvanceType extends BaseEntity implements IHumanIdentifiable{
         }
     }
 
-    @AssertTrue(message = "Default Max value must be greater than precision value")
+    @AssertTrue(message = "default maximum value must be greater than precision value")
     public boolean checkDefaultMaxValueGreaterThanPrecision() {
         if (defaultMaxValue.compareTo(unitPrecision) == -1) {
             return false;
diff --git a/libreplan-business/src/main/java/org/libreplan/business/advance/entities/DirectAdvanceAssignment.java b/libreplan-business/src/main/java/org/libreplan/business/advance/entities/DirectAdvanceAssignment.java
index 9c4bb6953..4ef909e66 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/advance/entities/DirectAdvanceAssignment.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/advance/entities/DirectAdvanceAssignment.java
@@ -223,7 +223,7 @@ public class DirectAdvanceAssignment extends AdvanceAssignment {
         return fake;
     }
 
-    @AssertTrue(message = "max value of percentage advance type must be 100")
+    @AssertTrue(message = "maxixum value of percentage progress type must be 100")
     public boolean checkConstraintMaxValueMustBe100ForPercentage() {
         AdvanceType advanceType = getAdvanceType();
         if ((advanceType != null) && (advanceType.getPercentage())) {
@@ -234,7 +234,7 @@ public class DirectAdvanceAssignment extends AdvanceAssignment {
         return true;
     }
 
-    @AssertTrue(message = "max value must be greater than zero")
+    @AssertTrue(message = "maximum value must be greater than zero")
     public boolean checkConstraintMaxValueMustBeGreaterThanZero() {
         return maxValue.compareTo(BigDecimal.ZERO) > 0;
     }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/HourCost.java b/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/HourCost.java
index 0b9c44e33..988a709a1 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/HourCost.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/HourCost.java
@@ -150,7 +150,7 @@ public class HourCost extends IntegrationEntity {
         return (this.getEndDate() == null || !date.isAfter(this.getEndDate()));
     }
 
-    @AssertTrue(message="The end date cannot be before the init date")
+    @AssertTrue(message="The end date cannot be before the start date")
     public boolean checkPositiveTimeInterval() {
         if (initDate == null) {
             return true;
diff --git a/libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java b/libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java
index ce7fe6eee..f14e7a97a 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java
@@ -107,7 +107,7 @@ public class ExpenseSheetLine extends IntegrationEntity {
         this.orderElement = orderElement;
     }
 
-    @NotNull(message = "order element not specified")
+    @NotNull(message = "task not specified")
     public OrderElement getOrderElement() {
         return orderElement;
     }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CustomerCommunication.java b/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CustomerCommunication.java
index 4e6f4ed7b..6153bec71 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CustomerCommunication.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CustomerCommunication.java
@@ -129,7 +129,7 @@ public class CustomerCommunication extends BaseEntity {
         this.order = order;
     }
 
-    @NotNull(message = "order not specified")
+    @NotNull(message = "project not specified")
     public Order getOrder() {
         return order;
     }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java
index 593396fdd..1feab7cd4 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java
@@ -346,7 +346,7 @@ public class Order extends OrderLineGroup implements Comparable {
     }
 
     @SuppressWarnings("unused")
-    @AssertTrue(message = "the order must have a start date")
+    @AssertTrue(message = "the project must have a start date")
     private boolean ifSchedulingModeIsForwardOrderMustHaveStartDate() {
         return getSchedulingMode() != SchedulingMode.FORWARD
                 || getInitDate() != null;
@@ -366,7 +366,7 @@ public class Order extends OrderLineGroup implements Comparable {
     }
 
     @SuppressWarnings("unused")
-    @AssertTrue(message = "At least one HoursGroup is needed for each OrderElement")
+    @AssertTrue(message = "At least one hours group is needed for each task")
     private boolean checkConstraintAtLeastOneHoursGroupForEachOrderElement() {
         for (OrderElement orderElement : this.getOrderElements()) {
             if (!orderElement.checkAtLeastOneHoursGroup()) {
@@ -420,7 +420,7 @@ public class Order extends OrderLineGroup implements Comparable {
         this.calendar = calendar;
     }
 
-    @NotNull(message = "order calendar not specified")
+    @NotNull(message = "project calendar not specified")
     public BaseCalendar getCalendar() {
         return calendar;
     }
@@ -432,7 +432,7 @@ public class Order extends OrderLineGroup implements Comparable {
         this.lastOrderElementSequenceCode++;
     }
 
-    @NotNull(message = "last order element sequence code not specified")
+    @NotNull(message = "last task sequence code not specified")
     public Integer getLastOrderElementSequenceCode() {
         return lastOrderElementSequenceCode;
     }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java
index c048dd48e..30ce97fe4 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java
@@ -1429,7 +1429,7 @@ public abstract class OrderElement extends IntegrationEntity implements
         return getOrder() != null ? getOrder().isCodeAutogenerated() : false;
     }
 
-    @AssertTrue(message = "a quality form cannot be assigned twice to the same order element")
+    @AssertTrue(message = "a quality form cannot be assigned twice to the same task")
     public boolean checkConstraintUniqueQualityForm() {
         Set<QualityForm> qualityForms = new HashSet<QualityForm>();
         for (TaskQualityForm each : taskQualityForms) {
diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java
index df7fedbf8..b201fe655 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java
@@ -1137,7 +1137,7 @@ public class OrderLineGroup extends OrderElement implements
         return result;
     }
 
-    @AssertTrue(message = "indirect advance assignments should have different types")
+    @AssertTrue(message = "indirect progress assignments should have different types")
     public boolean checkConstraintIndirectAdvanceAssignmentsWithDifferentType() {
         Set<String> types = new HashSet<String>();
         for (IndirectAdvanceAssignment each : indirectAdvanceAssignments) {
diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/Task.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/Task.java
index b3231dfcd..8a5ff623b 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/Task.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/Task.java
@@ -168,7 +168,7 @@ public class Task extends TaskElement implements ITaskPositionConstrained {
     }
 
     @SuppressWarnings("unused")
-    @AssertTrue(message = "order element associated to a task must be not empty")
+    @AssertTrue(message = "element associated to a task must be not empty")
     private boolean theOrderElementMustBeNotNull() {
         return getOrderElement() != null;
     }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskGroup.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskGroup.java
index b30266641..414991829 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskGroup.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskGroup.java
@@ -107,7 +107,7 @@ public class TaskGroup extends TaskElement {
     }
 
     @SuppressWarnings("unused")
-    @AssertTrue(message = "order element associated to a task group have to be defined")
+    @AssertTrue(message = "element associated to a task group have to be defined")
     private boolean theOrderElementMustBeNotNull() {
         return getOrderElement() != null;
     }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java b/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java
index 66f97be4b..15f2e68d8 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java
@@ -386,7 +386,7 @@ public class QualityForm extends BaseEntity implements IHumanIdentifiable{
         return (position >= 0 && position < qualityFormItems.size());
     }
 
-    @NotNull(message = "report advance not specified")
+    @NotNull(message = "report progress not specified")
     public Boolean isReportAdvance() {
         return BooleanUtils.toBoolean(reportAdvance);
     }
@@ -403,7 +403,7 @@ public class QualityForm extends BaseEntity implements IHumanIdentifiable{
         this.advanceType = advanceType;
     }
 
-    @AssertTrue(message = "advance type should not be null if report advance")
+    @AssertTrue(message = "progress type should must be defined if quality form reports progress")
     public boolean checkConstraintAdvanceTypeIsNotNullIfReportAdvance() {
         if (advanceType == null) {
             return !isReportAdvance();
diff --git a/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java b/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java
index 7a766c502..f76532add 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java
@@ -69,7 +69,7 @@ public class TaskQualityForm extends BaseEntity {
         this.taskQualityFormItems = taskQualityFormItems;
     }
 
-    @NotNull(message = "order element not specified")
+    @NotNull(message = "task not specified")
     public OrderElement getOrderElement() {
         return orderElement;
     }
@@ -168,7 +168,7 @@ public class TaskQualityForm extends BaseEntity {
         return true;
     }
 
-    @NotNull(message = "report advance not specified")
+    @NotNull(message = "report progress not specified")
     public Boolean isReportAdvance() {
         return BooleanUtils.toBoolean(reportAdvance);
     }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/MachineWorkersConfigurationUnit.java b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/MachineWorkersConfigurationUnit.java
index a08aa8bdc..15a2327a3 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/MachineWorkersConfigurationUnit.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/MachineWorkersConfigurationUnit.java
@@ -171,7 +171,7 @@ public class MachineWorkersConfigurationUnit extends BaseEntity implements
         return (this.alpha.compareTo(new BigDecimal(0)) > 0);
     }
 
-    @AssertTrue(message = "All Machine worker assignments must have a start date earlier than the finish date")
+    @AssertTrue(message = "All machine worker assignments must have a start date earlier than the end date")
     public boolean checkWorkerAssignmentsIntervalsProperlyDefined() {
         boolean correctIntervals = true;
         for (MachineWorkerAssignment each : workerAssignments) {
diff --git a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java
index 003a4f1e2..2ba500d53 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java
@@ -457,7 +457,7 @@ public class WorkReport extends IntegrationEntity implements
         lastWorkReportLineSequenceCode++;
     }
 
-    @NotNull(message = "last order element sequence code not specified")
+    @NotNull(message = "last timesheet line sequence code not specified")
     public Integer getLastWorkReportLineSequenceCode() {
         return lastWorkReportLineSequenceCode;
     }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java
index b4c1cb49f..15e07a6d6 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java
@@ -173,7 +173,7 @@ public class WorkReportLine extends IntegrationEntity implements Comparable,
     }
 
     @Override
-    @NotNull(message = "order element not specified")
+    @NotNull(message = "task not specified")
     public OrderElement getOrderElement() {
         return orderElement;
     }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java
index 6db4ddb9f..06b13404c 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java
@@ -342,7 +342,7 @@ public class CostCategoryCRUDController extends BaseCRUDController<CostCategory>
     private void appendDateboxInitDate(final Row row) {
         Datebox initDateBox = new Datebox();
         bindDateboxInitDate(initDateBox, (HourCost) row.getValue());
-        initDateBox.setConstraint("no empty:" + _("Init date cannot be empty"));
+        initDateBox.setConstraint("no empty:" + _("Start date cannot be empty"));
         row.appendChild(initDateBox);
 
         initDateBox.addEventListener("onChange", new EventListener() {
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java b/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java
index 107bc2e37..95328107b 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java
@@ -177,7 +177,7 @@ public class ResourcesCostCategoryAssignmentController extends GenericForwardCom
     private void appendDateboxInitDate(final Row row) {
         Datebox initDateBox = new Datebox();
         bindDateboxInitDate(initDateBox, (ResourcesCostCategoryAssignment) row.getValue());
-        initDateBox.setConstraint("no empty:" + _("Init date cannot be empty"));
+        initDateBox.setConstraint("no empty:" + _("Start date cannot be empty"));
         row.appendChild(initDateBox);
 
         initDateBox.addEventListener("onChange", new EventListener() {
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
index fd0773568..11c50b996 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
@@ -1335,7 +1335,7 @@ public class OrderCRUDController extends GenericForwardComposer {
                         && (startDate.compareTo(filterFinishDate.getValue()) > 0)) {
                     filterStartDate.setValue(null);
                     throw new WrongValueException(comp,
-                            _("must be lower than finish date"));
+                            _("must be lower than end date"));
                 }
             }
         };
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java
index eb45dcf1b..46221c0b4 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java
@@ -692,7 +692,7 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
                                 .getValue()) > 0)) {
                     filterStartDateOrderElement.setValue(null);
                     throw new WrongValueException(comp,
-                            _("must be lower than finish date"));
+                            _("must be lower than end date"));
                 }
             }
         };
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java
index d9bf40f74..53b45edbf 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java
@@ -89,7 +89,7 @@ public class OrdersTreeComponent extends TreeComponent {
         });
         columns.add(new OrdersTreeColumn(_("Must start after"),
                         "estimated_init",
-                        _("Estimated init date for the task (press enter in textbox to open calendar popup or type in date directly)")) {
+                        _("Estimated start date for the task (press enter in textbox to open calendar popup or type in date directly)")) {
 
             @Override
             protected void doCell(OrderElementTreeitemRenderer treeRenderer,
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java
index edfeb451d..31f202449 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java
@@ -250,7 +250,7 @@ public class ProjectDetailsController extends GenericForwardComposer {
                     initDate.setValue(null);
                     getOrder().setInitDate(null);
                     throw new WrongValueException(comp,
-                            _("must be lower than finish date"));
+                            _("must be lower than end date"));
                 }
             }
         };
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
index d553f6431..7bc641c09 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
@@ -272,7 +272,7 @@ public class CompanyPlanningController implements Composer {
                                 filterFinishDate.getRawValue()) > 0)) {
                     filterStartDate.setValue(null);
                     throw new WrongValueException(comp,
-                            _("must be lower than finish date"));
+                            _("must be lower than end date"));
                 }
             }
         };
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java
index 395a63a0f..6170c3321 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java
@@ -341,7 +341,7 @@ public class OrderPlanningController implements Composer {
                                 .getValue()) > 0)) {
                     filterStartDateOrderElement.setValue(null);
                     throw new WrongValueException(comp,
-                            _("must be lower than finish date"));
+                            _("must be lower than end date"));
                 }
             }
         };
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java
index 0fa2f86b3..5f1b85e13 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java
@@ -142,7 +142,7 @@ public class OrderCostsPerResourceController extends LibrePlanReportController {
                         && (startDateLine.compareTo(getEndingDate()) > 0)) {
                     ((Datebox) comp).setValue(null);
                     throw new WrongValueException(comp,
-                            _("must be lower than finish date"));
+                            _("must be lower than end date"));
                 }
             }
         };
@@ -158,7 +158,7 @@ public class OrderCostsPerResourceController extends LibrePlanReportController {
                         && (endingDate.compareTo(getStartingDate()) < 0)) {
                     ((Datebox) comp).setValue(null);
                     throw new WrongValueException(comp,
-                            _("must be after finish date"));
+                            _("must be after end date"));
                 }
             }
         };
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java
index 00a93806c..f59aea949 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java
@@ -422,7 +422,7 @@ public class MachineCRUDController extends BaseCRUDController<Machine> {
                         && (startDate.compareTo(filterFinishDate.getValue()) > 0)) {
                     filterStartDate.setValue(null);
                     throw new WrongValueException(comp,
-                            _("must be lower than finish date"));
+                            _("must be lower than end date"));
                 }
             }
         };
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java
index bafaa2c28..91e4192b1 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java
@@ -782,7 +782,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements
                         && (startDate.compareTo(filterFinishDate.getValue()) > 0)) {
                     filterStartDate.setValue(null);
                     throw new WrongValueException(comp,
-                            _("must be lower than finish date"));
+                            _("must be lower than end date"));
                 }
             }
         };
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java
index dd3529320..0714d77f2 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java
@@ -1517,7 +1517,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
                         && (startDate.compareTo(filterFinishDate.getValue()) > 0)) {
                     filterStartDate.setValue(null);
                     throw new WrongValueException(comp,
-                            _("must be before finish date"));
+                            _("must be before end date"));
                 }
             }
         };
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java
index 7ac06a504..54c8df48a 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java
@@ -153,7 +153,7 @@ public class WorkReportQueryController extends GenericForwardComposer {
                                 .getValue()) > 0)) {
                     filterStartDateLine.setValue(null);
                     throw new WrongValueException(comp,
-                            _("must be lower than finish date"));
+                            _("must be lower than end date"));
                 }
             }
         };
diff --git a/libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul b/libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul
index 9e0dd9855..8a1f4a75e 100644
--- a/libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul
+++ b/libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul
@@ -78,7 +78,7 @@
                                     <column label="${i18n:_('Code')}" align="center"/>
                                     <column label="${i18n:_('Type')}" align="center"/>
                                     <column label="${i18n:_('Price per hour')}" align="center"/>
-                                    <column label="${i18n:_('Init date')}" align="center"/>
+                                    <column label="${i18n:_('Start date')}" align="center"/>
                                     <column label="${i18n:_('End date')}" align="center"/>
                                     <column label="${i18n:_('Operations')}" width="150px" align="center"/>
                                 </columns>
diff --git a/libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul b/libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul
index a79ab4e0d..d18f502ba 100644
--- a/libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul
+++ b/libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul
@@ -19,7 +19,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<window id="${arg.id}" title="${i18n:_('Exception Day Types List')}">
+<window id="${arg.id}">
 
     <newdatasortablegrid id="listExceptionDayTypes"
         model="@{controller.exceptionDayTypes}"
diff --git a/libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul b/libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul
index e8a20a268..5415b4cc9 100644
--- a/libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul
+++ b/libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul
@@ -34,7 +34,7 @@
                     rowRenderer="@{assignmentController.costCategoryAssignmentsRenderer}">
                 <columns>
                     <column label="${i18n:_('Category name')}" align="center"/>
-                    <column label="${i18n:_('Init date')}" align="center"/>
+                    <column label="${i18n:_('Start date')}" align="center"/>
                     <column label="${i18n:_('End date')}" align="center"/>
                     <column label="${i18n:_('Operations')}" width="150px" align="center"/>
                 </columns>
diff --git a/libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul b/libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul
index d529f9136..d219ddd80 100644
--- a/libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul
+++ b/libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul
@@ -48,7 +48,7 @@
                             </hbox>
                         </row>
                         <row>
-                            <label value="${i18n:_('Unit measure name')}" />
+                            <label value="${i18n:_('Name')}" />
                             <textbox
                                 id="measureTextBox"
                                 value="@{controller.unitType.measure}"
diff --git a/libreplan-webapp/src/main/webapp/unittypes/_listUnitTypes.zul b/libreplan-webapp/src/main/webapp/unittypes/_listUnitTypes.zul
index 5c6ec3bc4..fba3e8569 100644
--- a/libreplan-webapp/src/main/webapp/unittypes/_listUnitTypes.zul
+++ b/libreplan-webapp/src/main/webapp/unittypes/_listUnitTypes.zul
@@ -19,12 +19,12 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<window id="${arg.top_id}" title="${i18n:_('Unit Measures List')}">
+<window id="${arg.top_id}">
     <newdatasortablegrid id="listing" model="@{controller.unitTypes}" mold="paging"
         pageSize="10" fixedLayout="true" sclass="clickable-rows"
         rowRenderer="@{controller.unitTypeRenderer}" >
         <columns>
-            <newdatasortablecolumn label="${i18n:_('Unit Measure')}"
+            <newdatasortablecolumn label="${i18n:_('Material Unit')}"
             sortDirection="ascending" sort="auto(measure)"/>
             <newdatasortablecolumn label="${i18n:_('Operations')}"/>
         </columns>