[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20110112054702-493i7dt0emwfv80z

2 files changed, 32 insertions, 22 deletions

diff --git a/addons/project_long_term/i18n/es.po b/addons/project_long_term/i18n/es.po
index 02864f319b0..d8b4bac7c33 100644
--- a/addons/project_long_term/i18n/es.po
+++ b/addons/project_long_term/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2010-12-31 10:23+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
+"PO-Revision-Date: 2011-01-11 22:11+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2011-01-12 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_long_term
@@ -143,12 +143,15 @@ msgid ""
 "Resources should be allocated to your phases and Members should be assigned "
 "to your Project!"
 msgstr ""
+"Los recursos deben de ser asignados a tus fases y los miembros a tu proyecto."
 
 #. module: project_long_term
 #: help:project.phase,date_end:0
 msgid ""
 " It's computed by the scheduler according to the start date and the duration."
 msgstr ""
+" Es calculado por el planificador en fucnión de la fecha de inicio y la "
+"duración"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_project
@@ -177,7 +180,7 @@ msgstr "Cancelado"
 #: code:addons/project_long_term/project_long_term.py:426
 #, python-format
 msgid "No tasks to compute for Project '%s'."
-msgstr ""
+msgstr "No existen tareas para calcular en este proyecto '%s'"
 
 #. module: project_long_term
 #: help:project.resource.allocation,date_end:0
@@ -301,11 +304,13 @@ msgstr "Fechas"
 msgid ""
 "Availability of this resource for this project phase in percentage (=50%)"
 msgstr ""
+"La disponibilidad de este recurso para esta fase de proyecto en porcentaje "
+"(=50%)"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
 msgid "force the phase to start after this date"
-msgstr ""
+msgstr "Forzar que la fase epiece después de esta fecha"
 
 #. module: project_long_term
 #: field:project.phase,task_ids:0
@@ -325,7 +330,7 @@ msgstr "_Aceptar"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Schedule and Display info"
-msgstr ""
+msgstr "Planificar y mostrar información"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -335,7 +340,7 @@ msgstr "Mes"
 #. module: project_long_term
 #: constraint:project.phase:0
 msgid "Phase start-date must be lower than phase end-date."
-msgstr ""
+msgstr "La fecha-inicio de la fase debe ser anterior a la fecha-fin."
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_schedule_tasks
@@ -367,7 +372,7 @@ msgstr "Asignación de recursos"
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
 msgid "force the phase to finish before this date"
-msgstr ""
+msgstr "Forzar que la fase termine antes de esta fecha"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -397,6 +402,8 @@ msgid ""
 "It's computed by the scheduler according the project date or the end date of "
 "the previous phase."
 msgstr ""
+"Es calculado por el planificador en función de la fecha inicio o fecha fin "
+"de la fase anterior"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -406,18 +413,18 @@ msgstr "Detalles tarea"
 #. module: project_long_term
 #: help:project.project,resource_calendar_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
+msgstr "Horario de trabajo para ajustar el informe del diagrama de Gantt"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
-msgstr ""
+msgstr "Calcular tareas proyecto"
 
 #. module: project_long_term
 #: code:addons/project_long_term/project_long_term.py:244
 #, python-format
 msgid "No responsible person assigned !"
-msgstr ""
+msgstr "¡No hay un reponsable asignado!"
 
 #. module: project_long_term
 #: code:addons/project_long_term/project_long_term.py:489
@@ -429,7 +436,7 @@ msgstr "Error"
 #: code:addons/project_long_term/project_long_term.py:244
 #, python-format
 msgid "You must assign a responsible person for phase '%s' !"
-msgstr ""
+msgstr "¡Debe asignar un reponsable por fase '%s'!"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -439,7 +446,7 @@ msgstr "Restricciones"
 #. module: project_long_term
 #: help:project.phase,sequence:0
 msgid "Gives the sequence order when displaying a list of phases."
-msgstr ""
+msgstr "Indica el orden cuando se muestra la lista de fases"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phase
@@ -449,7 +456,7 @@ msgstr ""
 #: view:project.phase:0
 #: field:project.project,phase_ids:0
 msgid "Project Phases"
-msgstr ""
+msgstr "Fases proyecto"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -498,7 +505,7 @@ msgstr "Comenzar fase"
 #: code:addons/project_long_term/wizard/project_compute_phases.py:50
 #, python-format
 msgid "Please Specify Project to be schedule"
-msgstr ""
+msgstr "Por favor seleccione el proyecto a planificar"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -509,12 +516,12 @@ msgstr "Total horas"
 #. module: project_long_term
 #: view:project.schedule.tasks:0
 msgid "Task Scheduling completed successfully."
-msgstr ""
+msgstr "Planificación de tareas completada satisfactoriamente."
 
 #. module: project_long_term
 #: view:project.compute.tasks:0
 msgid "Compute Scheduling of Task for specified project."
-msgstr ""
+msgstr "Calcular planificación de tareas para un proyecto específico"
 
 #. module: project_long_term
 #: view:project.resource.allocation:0
@@ -551,7 +558,7 @@ msgstr "Nombre"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Tasks Details"
-msgstr ""
+msgstr "Detalles tareas"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
@@ -572,7 +579,7 @@ msgstr "Planificación"
 #: code:addons/project_long_term/project_long_term.py:329
 #, python-format
 msgid "No tasks to compute for Phase '%s'."
-msgstr ""
+msgstr "No existen tareas para el cálculo para la fase '%s'."
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
diff --git a/addons/project_long_term/i18n/fr.po b/addons/project_long_term/i18n/fr.po
index 1df309a8c2a..a2f6af52a29 100755
--- a/addons/project_long_term/i18n/fr.po
+++ b/addons/project_long_term/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2011-01-10 11:00+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2011-01-11 14:57+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2011-01-12 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_long_term
@@ -434,6 +435,8 @@ msgid ""
 "It's computed by the scheduler according the project date or the end date of "
 "the previous phase."
 msgstr ""
+"Ceci est calculé par l'ordonnanceur en fonction de la date du projet ou de "
+"la date de fin de la tâche précédente."
 
 #. module: project_long_term
 #: view:project.phase:0