diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java index 05116f8f8..5bd7408a8 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java @@ -92,7 +92,7 @@ public abstract class ResourcesPerDayModification extends @Override public String getNoValidPeriodsMessage() { - String firstLine = _("There are no days available due to not satisfying the criterions."); + String firstLine = _("There are no days available due to not satisfying the criteria."); String secondLine = _("Another possibility is that the resources don't have days available due to their calendars."); return firstLine + "\n" + secondLine; } @@ -100,7 +100,7 @@ public abstract class ResourcesPerDayModification extends @Override public String getNoValidPeriodsMessageDueToIntersectionMessage() { String firstLine = _("There are no days available in the days marked available by the task calendar."); - String secondLine = _("Maybe the criterions are not satisfied in those days."); + String secondLine = _("Maybe the criteria are not satisfied in those days."); return firstLine + "\n" + secondLine; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java index 82dfc8bee..9e3827819 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java @@ -247,7 +247,7 @@ public abstract class AssignedCriterionRequirementController extends try { int status = Messagebox .show( - _("Are you sure of changing the resource type? You will lose the criterions with different resource type."), + _("Are you sure of changing the resource type? You will lose the criteria with different resource type."), "Question", Messagebox.OK | Messagebox.CANCEL, Messagebox.QUESTION); 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 9f5ae1817..51f27aea8 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 @@ -727,7 +727,7 @@ public abstract class AllocationRow { String firstLine = _( "In the available periods {0} only {1} hours are available.", validPeriods, sumReached.getHours()); - String secondLine = isGeneric() ? _("The periods available depend on the satisfaction of the criterions by the resources and their calendars.") + String secondLine = isGeneric() ? _("The periods available depend on the satisfaction of the criteria by the resources and their calendars.") : _("The periods available depend on the resource's calendar."); throw new WrongValueException(effortInput, firstLine + "\n" + secondLine); diff --git a/navalplanner-webapp/src/main/resources/i18n/es.po b/navalplanner-webapp/src/main/resources/i18n/es.po index 5401f47b3..44b7c1f1f 100644 --- a/navalplanner-webapp/src/main/resources/i18n/es.po +++ b/navalplanner-webapp/src/main/resources/i18n/es.po @@ -381,7 +381,7 @@ msgstr "Reasignación" #: 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 " +"The periods available depend on the satisfaction of the criteria by the " "resources and their calendars." msgstr "" "Los períodos disponibles dependen de la satisfacción de criterios por los " @@ -4623,7 +4623,7 @@ msgid "Company data" msgstr "Datos de la empresa" #: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:22 -msgid "Criterions Requirement" +msgid "Criteria Requirement" msgstr "Criterios requeridos" #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:215 @@ -5150,7 +5150,7 @@ msgstr "Los campos de índice y las etiquetas deben ser únicas y consecutivas" #: 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 " +"Are you sure of changing the resource type? You will lose the criteria " "with different resource type." msgstr "" "¿Está seguro de cambiar el tipo de recurso? Los criterios con diferente tipo " @@ -6886,7 +6886,7 @@ msgid "Sigmoid" msgstr "Sigmoide" #: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:95 -msgid "There are no days available due to not satisfying the criterions." +msgid "There are no days available due to not satisfying the criteria." msgstr "No hay días disponibles debido a que no se satisfacen los criterios." #: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:96 @@ -6906,7 +6906,7 @@ msgstr "" "calendario de la tarea." #: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:103 -msgid "Maybe the criterions are not satisfied in those days." +msgid "Maybe the criteria are not satisfied in those days." msgstr "Puede que los criterios no se satisfagan en esos días." #: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:170 diff --git a/navalplanner-webapp/src/main/resources/i18n/gl.po b/navalplanner-webapp/src/main/resources/i18n/gl.po index 86dcc6bba..fa3d106e1 100644 --- a/navalplanner-webapp/src/main/resources/i18n/gl.po +++ b/navalplanner-webapp/src/main/resources/i18n/gl.po @@ -377,7 +377,7 @@ msgstr "Reasignación" #: 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 " +"The periods available depend on the satisfaction of the criteria by the " "resources and their calendars." msgstr "" "Os períodos dispoñibles dependen da satisfacción dos criterios polos " @@ -4608,7 +4608,7 @@ msgid "Company data" msgstr "Datos da empresa" #: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:22 -msgid "Criterions Requirement" +msgid "Criteria Requirement" msgstr "Criterios requiridos" #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:215 @@ -5132,7 +5132,7 @@ msgstr "Os campos de índice e as etiquetas deben ser únicas e consecutivas" #: 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 " +"Are you sure of changing the resource type? You will lose the criteria " "with different resource type." msgstr "" "¿Está seguro de cambiar o tipo de recurso? Os criterios con diferente tipo " @@ -6865,7 +6865,7 @@ msgid "Sigmoid" msgstr "Sigmoide" #: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:95 -msgid "There are no days available due to not satisfying the criterions." +msgid "There are no days available due to not satisfying the criteria." msgstr "Non hai días dispoñibles debido a que non se satisfacen os criterios." #: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:96 @@ -6885,7 +6885,7 @@ msgstr "" "da tarefa." #: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:103 -msgid "Maybe the criterions are not satisfied in those days." +msgid "Maybe the criteria are not satisfied in those days." msgstr "Pode que os criterios non se satisfagan neses días." #: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:170 diff --git a/navalplanner-webapp/src/main/resources/i18n/keys.pot b/navalplanner-webapp/src/main/resources/i18n/keys.pot index 73c5792f3..7ce104c9b 100644 --- a/navalplanner-webapp/src/main/resources/i18n/keys.pot +++ b/navalplanner-webapp/src/main/resources/i18n/keys.pot @@ -372,7 +372,7 @@ 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 " +"The periods available depend on the satisfaction of the criteria by the " "resources and their calendars." msgstr "" @@ -4509,7 +4509,7 @@ msgid "Company data" msgstr "" #: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:22 -msgid "Criterions Requirement" +msgid "Criteria Requirement" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:215 @@ -5021,7 +5021,7 @@ msgstr "" #: 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 " +"Are you sure of changing the resource type? You will lose the criteria " "with different resource type." msgstr "" @@ -6713,7 +6713,7 @@ msgid "Sigmoid" msgstr "" #: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:95 -msgid "There are no days available due to not satisfying the criterions." +msgid "There are no days available due to not satisfying the criteria." msgstr "" #: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:96 @@ -6729,7 +6729,7 @@ msgid "" msgstr "" #: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:103 -msgid "Maybe the criterions are not satisfied in those days." +msgid "Maybe the criteria are not satisfied in those days." msgstr "" #: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:170 diff --git a/navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul b/navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul index 273e23eb2..95604a797 100644 --- a/navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul +++ b/navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul @@ -19,7 +19,7 @@ along with this program. If not, see . --> - +