From 89cf846b253f25c1c8486ccd8efbb534b96a93c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Wed, 9 Dec 2009 18:44:08 +0100
Subject: [PATCH]  ItEr38S18DocumentacionFormacionItEr36S06: Corrected English
 strings in the code

---
 .../org/navalplanner/web/common/ConfigurationController.java  | 2 +-
 .../AssignedCriterionRequirementToOrderElementController.java | 2 +-
 .../org/navalplanner/web/planner/allocation/FormBinder.java   | 2 +-
 .../web/workreports/WorkReportTypeCRUDController.java         | 2 +-
 .../org/navalplanner/web/workreports/WorkReportTypeModel.java | 2 +-
 .../ws/resources/criterion/impl/CriterionConverter.java       | 2 +-
 navalplanner-webapp/src/main/webapp/calendars/_edition.zul    | 4 ++--
 navalplanner-webapp/src/main/webapp/common/layout/login.zul   | 4 ++--
 .../src/main/webapp/common/layout/template.zul                | 2 +-
 .../webapp/orders/_listOrderElementCriterionRequirements.zul  | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
index de385d265..f9d959232 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
@@ -88,7 +88,7 @@ public class ConfigurationController extends GenericForwardComposer {
 
     public void cancel() throws InterruptedException {
         configurationModel.cancel();
-        Messagebox.show(_("Changes has been canceled"), _("Information"),
+        Messagebox.show(_("Changes have been canceled"), _("Information"),
                 Messagebox.OK, Messagebox.INFORMATION);
         reloadWindow();
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java
index 1ae0724fb..bb85b5c3d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java
@@ -231,7 +231,7 @@ setValidCriterionRequirementWrapper(requirement, true);
         try {
             int status = Messagebox
                     .show(
-                            _("You are sure of change the resource type. You will lose the criterions with different resource type."),
+                            _("Are you sure of changing the resource type? You will lose the criterions with different resource type."),
                             "Question", Messagebox.OK | Messagebox.CANCEL,
                             Messagebox.QUESTION);
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java
index 08b256dce..0b23c1647 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java
@@ -443,7 +443,7 @@ class FormBinder {
 
     public void markThereisAlreadyAssignmentWith(Set<Criterion> criterions) {
         messagesForUser.showMessage(Level.ERROR, _(
-                "for criterions {0} already exists an allocation",
+                "already exists an allocation for criteria {0}",
                 ResourceLoadModel.getName(criterions)));
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java
index 3750a0db0..8aba7f101 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java
@@ -745,7 +745,7 @@ public class WorkReportTypeCRUDController extends GenericForwardComposer
                     descriptionField.setFieldName(null);
                     throw new WrongValueException(
                             comp,
-                            _("A description field of the same name already exist."));
+                            _("A description field of the same name already exists."));
                 }
             }
         };
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java
index 15f18b03e..54ee5dbbb 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java
@@ -354,7 +354,7 @@ public class WorkReportTypeModel implements IWorkReportTypeModel {
         getWorkReportType().setName(name);
         if (!getWorkReportType().checkConstraintUniqueWorkReportTypeName()) {
             throw new IllegalArgumentException(
-                    _("Exist other workReportType with the same name."));
+                    _("There exists other workReportType with the same name."));
         }
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java
index 3946ccc18..7424ac133 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java
@@ -135,7 +135,7 @@ public final class CriterionConverter {
 
         if (value == null) {
             throw new RuntimeException(_("Unable to convert {0} " +
-                 " value to {1} type", resource.toString(),
+                 "value to {1} type", resource.toString(),
                  ResourceEnumDTO.class.getName()));
         } else {
             return value;
diff --git a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
index df91bac19..a128c3dd7 100644
--- a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
@@ -164,7 +164,7 @@
                             <listheader label="${i18n:_('Name')}" />
                             <listheader label="${i18n:_('Parent')}" />
                             <listheader label="${i18n:_('Valid from')}" />
-                            <listheader label="${i18n:_('Expiring date')}" />
+                            <listheader label="${i18n:_('Expiry date')}" />
                             <listheader label="${i18n:_('Summary')}" />
                             <listheader label="${i18n:_('Operations')}" />
                         </listhead>
@@ -211,7 +211,7 @@
                     itemRenderer="@{calendarController.editionController.calendarAvailabilityRenderer}">
                     <listhead>
                         <listheader label="${i18n:_('Valid from')}" />
-                        <listheader label="${i18n:_('Expiration date')}" />
+                        <listheader label="${i18n:_('Expiry date')}" />
                         <listheader label="${i18n:_('Operations')}" />
                     </listhead>
                 </listbox>
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/login.zul b/navalplanner-webapp/src/main/webapp/common/layout/login.zul
index d9c082464..deba0da10 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/login.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/login.zul
@@ -37,7 +37,7 @@
     <n:td width="20" class="identificacion"> </n:td>
     <n:td class="identificacion">${i18n:_('Access to the system')}</n:td>
     <n:td align="right" valign="bottom">
-        <div tooltiptext="${i18n:_('Help on authentication (opens en new window')}">
+        <div tooltiptext="${i18n:_('Help on authentication (opens a new window)')}">
             <n:a href="https://naval.igalia.com/fileadmin/templates/doc/index.html" target="_blank" class="ayuda">${i18n:_('Help')}</n:a>
         </div>
     </n:td>
@@ -76,7 +76,7 @@
         <n:tr>
           <n:td>
               <n:div align="left">
-                <n:input name="button" type="submit" class="entrar" id="button" value="${i18n:_('Sign in')}" />
+                <n:input name="button" type="submit" class="entrar" id="button" value="${i18n:_('Log in')}" />
             </n:div></n:td>
         </n:tr>
     </n:table></n:td>
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template.zul b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
index 71592d055..92166e63f 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/template.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
@@ -49,7 +49,7 @@
           <n:table width="100%" border="0" cellspacing="0" cellpadding="0">
             <n:tr>
               <n:td class="usuario">${i18n:_('user')}: ${desktop.execution.userPrincipal.name}</n:td>
-              <n:td><n:a href="/navalplanner-webapp/j_spring_security_logout" class="cerrar_sesion">[${i18n:_('Sign out')}]</n:a></n:td>
+              <n:td><n:a href="/navalplanner-webapp/j_spring_security_logout" class="cerrar_sesion">[${i18n:_('Log out')}]</n:a></n:td>
             </n:tr>
           </n:table>
         </n:div>
diff --git a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul
index 4cf58e2ea..f29bca70d 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul
@@ -26,7 +26,7 @@ criterionRequirementsController = new org.navalplanner.web.orders.AssignedCriter
 </zscript>
 <vbox id="${arg.id}"
     apply="${criterionRequirementsController}">
-<panel title="${i18n:_('Assigned Criterions Requirement')}" border="normal"
+<panel title="${i18n:_('Assigned Criterion Requirements')}" border="normal"
     style="overflow:auto" width="99%">
     <panelchildren>
         <hbox align="center">