From 4a69079c3007adc821d04fec0e41687773e6e151 Mon Sep 17 00:00:00 2001 From: Susana Montes Pedreira Date: Tue, 11 Jan 2011 18:00:57 +0100 Subject: [PATCH] [Bug #785] it has fixed translations of the changes in the company list. FEA : ItEr68S04BugFixing --- navalplanner-webapp/src/main/resources/i18n/es.po | 8 ++++++-- navalplanner-webapp/src/main/resources/i18n/gl.po | 8 ++++++-- navalplanner-webapp/src/main/resources/i18n/keys.pot | 6 +++++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/navalplanner-webapp/src/main/resources/i18n/es.po b/navalplanner-webapp/src/main/resources/i18n/es.po index 26dbf961a..e568dbeed 100644 --- a/navalplanner-webapp/src/main/resources/i18n/es.po +++ b/navalplanner-webapp/src/main/resources/i18n/es.po @@ -1238,8 +1238,8 @@ msgid "Select date:" msgstr "Seleccione fecha:" #: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29 -msgid "Integrated user" -msgstr "Usuario integrado" +msgid "Associated user" +msgstr "Usuario asociado" #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:561 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1015 @@ -4658,6 +4658,10 @@ msgstr "NavalPlan: Máquinas" msgid "Load due to current project" msgstr "Carga debido al proyecto actual" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:145 +msgid "You can not remove the company \"{0}\" because is already in use in some project or in some subcontrated task." +msgstr "No puede borrar la empresa \"{0}\" porque está siendo utilizada en ulgún proyecto o en alguna tarea subcontrada." + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1273 msgid "You are going to change the assignment function. Are you sure?" msgstr "Va a cambiar la función de asignación. ¿Está seguro?" diff --git a/navalplanner-webapp/src/main/resources/i18n/gl.po b/navalplanner-webapp/src/main/resources/i18n/gl.po index 2aa6d74fc..0baf51057 100644 --- a/navalplanner-webapp/src/main/resources/i18n/gl.po +++ b/navalplanner-webapp/src/main/resources/i18n/gl.po @@ -1229,8 +1229,8 @@ msgid "Select date:" msgstr "Seleccione data:" #: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29 -msgid "Integrated user" -msgstr "Usuario integrado" +msgid "Associated user" +msgstr "Usuario asociado" #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:561 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1015 @@ -4641,6 +4641,10 @@ msgstr "NavalPlan: Máquinas" msgid "Load due to current project" msgstr "Carga debido ao proxecto actual" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:145 +msgid "You can not remove the company \"{0}\" because is already in use in some project or in some subcontrated task." +msgstr "Non pode eliminar a empresa \"{0}\" porque está sendo utilizada nalgún proxecto ou nalgunha tarefa subcontrada." + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1273 msgid "You are going to change the assignment function. Are you sure?" msgstr "Vai cambiar a función de asignación. ¿Está seguro?" diff --git a/navalplanner-webapp/src/main/resources/i18n/keys.pot b/navalplanner-webapp/src/main/resources/i18n/keys.pot index e5ed8b3a5..e2b7c437e 100644 --- a/navalplanner-webapp/src/main/resources/i18n/keys.pot +++ b/navalplanner-webapp/src/main/resources/i18n/keys.pot @@ -1200,7 +1200,7 @@ msgid "Select date:" msgstr "" #: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29 -msgid "Integrated user" +msgid "Associated user" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:561 @@ -4555,6 +4555,10 @@ msgstr "" msgid "Load due to current project" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:145 +msgid "You can not remove the company \"{0}\" because is already in use in some project or in some subcontrated task." +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1273 msgid "You are going to change the assignment function. Are you sure?" msgstr ""