From c1a088fcc3cd7cd48d51cd67a4d1ec100d4d7943 Mon Sep 17 00:00:00 2001 From: Susana Montes Pedreira Date: Wed, 27 Oct 2010 20:46:57 +0200 Subject: [PATCH] It adds new Spanish and Galician translations. It adds the Spanish and Galician translations for the labels on the configuration interface. FEA :ItEr61S04NavalPlanEntities --- .../web/common/ConfigurationController.java | 2 +- .../src/main/resources/i18n/es.po | 57 ++++++++++++------- .../src/main/resources/i18n/gl.po | 57 ++++++++++++------- .../src/main/resources/i18n/keys.pot | 53 +++++++++++------ .../src/main/webapp/common/configuration.zul | 2 +- 5 files changed, 111 insertions(+), 60 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 7748a17bd..bff0cf563 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 @@ -122,7 +122,7 @@ public class ConfigurationController extends GenericForwardComposer { final EntityNameEnum entityName) { try { Button button = (Button) component.getFirstChild().getLastChild(); - button.setLabel(_("New")); + button.setLabel(_("New sequence")); button.addEventListener(Events.ON_CLICK, new EventListener() { @Override diff --git a/navalplanner-webapp/src/main/resources/i18n/es.po b/navalplanner-webapp/src/main/resources/i18n/es.po index b98945cbd..d7b3b27c0 100644 --- a/navalplanner-webapp/src/main/resources/i18n/es.po +++ b/navalplanner-webapp/src/main/resources/i18n/es.po @@ -138,26 +138,8 @@ msgid "Operations" msgstr "Operaciones" #: navalplanner-webapp/src/main/webapp/common/configuration.zul:125 -msgid "New order sequence" -msgstr "Nueva secuencia de pedido" - -msgid "New criterion sequence" -msgstr "Nueva secuencia de criterio" - -msgid "New label sequence" -msgstr "Nueva secuencia de etiqueta" - -msgid "New machine sequence" -msgstr "Nueva secuencia de maquina" - -msgid "New worker sequence" -msgstr "Nueva secuencia de trabajador" - -msgid "New unit type sequence" -msgstr "Nueva secuencia de unidad de medida" - -msgid "New calendar sequence" -msgstr "Nueva secuencia de calendario" +msgid "Calendar exception types" +msgstr "Tipos de excepciones de calendario" #: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:27 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:29 @@ -198,6 +180,9 @@ msgstr "Materiales" msgid "Order view" msgstr "Vista de pedido" +msgid "New sequence" +msgstr "Nueva secuencia" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:296 msgid "Reassign" msgstr "Reasignar" @@ -260,6 +245,33 @@ msgstr "Secuencias de unidad de medida" msgid "Calendar sequences" msgstr "Secuencias de calendario" +msgid "Type of work hours sequences" +msgstr "Secuencias de tipos de horas de trabajo" + +msgid "Material category sequences" +msgstr "Secuencias de categorias de material" + +msgid "Work report sequences" +msgstr "Secuencias de informes de trabajo" + +msgid "Work report type sequences" +msgstr "Secuencias de tipos de informes de trabajo" + +msgid "Calendar exception type sequences" +msgstr "Secuencias de tipos de excepciones de calendario" + +msgid "Cost category sequences" +msgstr "Secuencias de categorias de coste" + +msgid "Resource calendar sequences" +msgstr "Secuencias de calendarios de recursos" + +msgid "Criterion satisfaction sequences" +msgstr "Secuencias de criterios satisfechos" + +msgid "Resource cost category assignment sequences" +msgstr "Secuencias de asignaciones de categorias de coste a recursos" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:273 msgid "Reports" msgstr "Informes" @@ -507,9 +519,14 @@ msgstr "No se puede eliminar un escenario con escenarios derivados" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:270 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:21 + msgid "Work Report Models" msgstr "Modelos de partes de trabajo" +msgid "Work report types" +msgstr "Tipos de partes de trabajo" + + #: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:22 msgid "Create new version" msgstr "Crear versión nueva" diff --git a/navalplanner-webapp/src/main/resources/i18n/gl.po b/navalplanner-webapp/src/main/resources/i18n/gl.po index 76fa0a1d7..5c2ac7704 100644 --- a/navalplanner-webapp/src/main/resources/i18n/gl.po +++ b/navalplanner-webapp/src/main/resources/i18n/gl.po @@ -138,26 +138,8 @@ msgid "Operations" msgstr "Operacións" #: navalplanner-webapp/src/main/webapp/common/configuration.zul:125 -msgid "New order sequence" -msgstr "Nova secuencia de pedido" - -msgid "New criterion sequence" -msgstr "Nova secuencia de criterio" - -msgid "New label sequence" -msgstr "Nova secuencia de etiqueta" - -msgid "New machine sequence" -msgstr "Nova secuencia de maquina" - -msgid "New worker sequence" -msgstr "Nova secuencia de traballador" - -msgid "New unit type sequence" -msgstr "Nova secuencia de unidade de medida" - -msgid "New calendar sequence" -msgstr "Nova secuencia de calendario" +msgid "Calendar exception types" +msgstr "Tipos de excepcións de calendario" #: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:27 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:29 @@ -198,6 +180,9 @@ msgstr "Materiais" msgid "Order view" msgstr "Vista de pedido" +msgid "New sequence" +msgstr "Nova secuencia" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:296 msgid "Reassign" msgstr "Reasignar" @@ -260,6 +245,33 @@ msgstr "Secuencias de unidade de medida" msgid "Calendar sequences" msgstr "Secuencias de calendario" +msgid "Type of work hours sequences" +msgstr "Secuencias de tipos de horas de traballo" + +msgid "Material category sequences" +msgstr "Secuencias de categorias de material" + +msgid "Work report sequences" +msgstr "Secuencias de informes de traballo" + +msgid "Work report type sequences" +msgstr "Secuencias de tipos de informes de traballo" + +msgid "Calendar exception type sequences" +msgstr "Secuencias de tipos de excepcións de calendario" + +msgid "Cost category sequences" +msgstr "Secuencias de categorias de costo" + +msgid "Resource calendar sequences" +msgstr "Secuencias de calendarios de recursos" + +msgid "Criterion satisfaction sequences" +msgstr "Secuencias de criterios satisfeitos" + +msgid "Resource cost category assignment sequences" +msgstr "Secuencias de asignacións de categorias de costo a recursos" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:273 msgid "Reports" msgstr "Informes" @@ -506,9 +518,14 @@ msgstr "Non se pode borrar un escenario con escenarios derivados" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:270 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:21 + msgid "Work Report Models" msgstr "Modelos de partes de traballo" +msgid "Work report types" +msgstr "Tipos de partes de traballo" + + #: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:22 msgid "Create new version" msgstr "Crear versión nova" diff --git a/navalplanner-webapp/src/main/resources/i18n/keys.pot b/navalplanner-webapp/src/main/resources/i18n/keys.pot index bb9985624..4db056d91 100644 --- a/navalplanner-webapp/src/main/resources/i18n/keys.pot +++ b/navalplanner-webapp/src/main/resources/i18n/keys.pot @@ -137,25 +137,8 @@ msgid "Operations" msgstr "" #: navalplanner-webapp/src/main/webapp/common/configuration.zul:125 -msgid "New order sequence" -msgstr "" -msgid "New criterion sequence" -msgstr "" - -msgid "New label sequence" -msgstr "" - -msgid "New machine sequence" -msgstr "" - -msgid "New worker sequence" -msgstr "" - -msgid "New unit type sequence" -msgstr "" - -msgid "New calendar sequence" +msgid "Calendar exception types" msgstr "" #: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:27 @@ -197,6 +180,9 @@ msgstr "" msgid "Order view" msgstr "" +msgid "New sequence" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:296 msgid "Reassign" msgstr "" @@ -259,6 +245,33 @@ msgstr "" msgid "Calendar sequences" msgstr "" +msgid "Type of work hours sequences" +msgstr "" + +msgid "Material category sequences" +msgstr "" + +msgid "Work report sequences" +msgstr "" + +msgid "Work report type sequences" +msgstr "" + +msgid "Calendar exception type sequences" +msgstr "" + +msgid "Cost category sequences" +msgstr "" + +msgid "Resource calendar sequences" +msgstr "" + +msgid "Criterion satisfaction sequences" +msgstr "" + +msgid "Resource cost category assignment sequences" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:273 msgid "Reports" msgstr "" @@ -495,7 +508,11 @@ msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:270 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:21 + msgid "Work Report Models" + +msgid "Work report types" + msgstr "" #: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:22 diff --git a/navalplanner-webapp/src/main/webapp/common/configuration.zul b/navalplanner-webapp/src/main/webapp/common/configuration.zul index c710b9879..c1c2ec44a 100644 --- a/navalplanner-webapp/src/main/webapp/common/configuration.zul +++ b/navalplanner-webapp/src/main/webapp/common/configuration.zul @@ -110,7 +110,7 @@ onCheck="configurationController.reloadGeneralConfiguration();" /> -