[MERGE] merged with main addons

bzr revid: bde@tinyerp.com-20110915113201-fgbs2d2qr45ljmsg

30 files changed, 439 insertions, 693 deletions

diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index d2e0702f067..adf1d9d69c4 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -43,7 +43,7 @@ in the form of pdf file. Implements a dashboard for My Current Evaluations
     "data": [
         "security/ir.model.access.csv",
         "security/hr_evaluation_security.xml",
-        "wizard/hr_evaluation_mail_view.xml",
+#        "wizard/hr_evaluation_mail_view.xml",
         "hr_evaluation_view.xml",
         "report/hr_evaluation_report_view.xml",
         "board_hr_evaluation_view.xml",
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 0b0ebb92261..7634052704c 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -24,7 +24,6 @@ from datetime import datetime
 from dateutil.relativedelta import relativedelta
 from dateutil import parser
 from osv import fields, osv
-import tools
 from tools.translate import _
 
 class hr_evaluation_plan(osv.osv):
@@ -193,6 +192,7 @@ class hr_evaluation(osv.osv):
         return {'value': {'plan_id':evaluation_plan_id}}
 
     def button_plan_in_progress(self, cr, uid, ids, context=None):
+        mail_message = self.pool.get('mail.message')
         hr_eval_inter_obj = self.pool.get('hr.evaluation.interview')
         if context is None:
             context = {}
@@ -229,7 +229,7 @@ class hr_evaluation(osv.osv):
                         sub = phase.email_subject
                         dest = [child.work_email]
                         if dest:
-                           tools.email_send(evaluation.employee_id.work_email, dest, sub, body)
+                           mail_message.schedule_with_attach(cr, uid, evaluation.employee_id.work_email, dest, sub, body, context=context)
 
         self.write(cr, uid, ids, {'state':'wait'}, context=context)
         return True
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 46d5cf55a98..869d1f93994 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -222,7 +222,7 @@
             <field name="model">hr_evaluation.evaluation</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('wait','progress');gray:state in('done','cancel')" string="Evaluation">
+                <tree colors="blue:state == 'draft';black:state in ('wait','progress');gray:state in('done','cancel')" string="Evaluation">
                     <field name="employee_id"/>
                     <field name="plan_id"/>
                     <field name="date"/>
@@ -306,6 +306,10 @@
                         <field name="response" readonly="1"/>
                         <field name="user_to_review_id"/>
                         <field name="user_id" string="Interviewer"/>
+                        <button string="Send Reminder Email"
+                        name="%(mail.action_email_compose_message_wizard)d"
+                        icon="terp-mail-message-new" type="action" colspan="2"
+                        states="waiting_answer"/>
                     </group>
                     <newline/>
                     <separator string="State" colspan="4"/>
@@ -329,6 +333,7 @@
                     <field name="response" readonly="1" invisible="True"/>
                     <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
                     <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0}" attrs="{'readonly':[('response','=',False)]}" />
+                    <button name="%(mail.action_email_compose_message_wizard)d" string="Send Reminder Email" icon="terp-mail-message-new" type="action" colspan="2" states="waiting_answer"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -403,8 +408,16 @@
 
         <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
             action="action_hr_evaluation_interview_tree"/>
-        <menuitem name="Evaluation Reminders" parent="menu_eval_hr" id="menu_eval_send_mail"
-           action="action_hr_evaluation_send_mail" sequence="45" groups="base.group_hr_manager"/>
+
+      <!-- Email Compose message Action-->
+      <act_window
+      id="evaluation_reminders" name="Evaluation Reminders"
+      res_model="mail.compose.message"
+      src_model="hr.evaluation.interview"
+      view_type="form" view_mode="form"
+      target="new" multi="True"
+      key2="client_action_multi"
+      context="{'mail.compose.message.mode':'mass_mail'}"/>
 
       <!-- Evaluation Interviews Button on Employee Form -->
       <act_window
diff --git a/addons/hr_evaluation/i18n/bg.po b/addons/hr_evaluation/i18n/bg.po
index 69672cf8dc6..108f1c9494d 100644
--- a/addons/hr_evaluation/i18n/bg.po
+++ b/addons/hr_evaluation/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -178,7 +178,7 @@ msgstr "Не отговаря на очакванията"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal"
-msgstr ""
+msgstr "Оценка"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -288,7 +288,7 @@ msgstr "(date)s: Текуща дата"
 #: code:addons/hr_evaluation/hr_evaluation.py:80
 #, python-format
 msgid "Regarding "
-msgstr ""
+msgstr "Относно "
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -451,7 +451,7 @@ msgstr "Месец"
 #. module: hr_evaluation
 #: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
 msgid "Human Resources Evaluation"
-msgstr ""
+msgstr "Атестация на човешките ресурси"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -620,7 +620,7 @@ msgstr "Изпращане на анонимна обобщена информа
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Interview Evaluation"
-msgstr ""
+msgstr "Атестационно интервю"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_plan_tree
@@ -657,7 +657,7 @@ msgstr "Последно одобряване"
 #. module: hr_evaluation
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Waiting Appreciation"
-msgstr ""
+msgstr "Очаква атестация"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_feature:0
@@ -786,7 +786,7 @@ msgstr ""
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,survey_request_ids:0
 msgid "Appraisal Forms"
-msgstr ""
+msgstr "Атестационни форми"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -887,13 +887,13 @@ msgstr ""
 #. module: hr_evaluation
 #: field:hr.evaluation.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Създаване на дата"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Година"
 
 #. module: hr_evaluation
 #: help:hr.employee,evaluation_date:0
diff --git a/addons/hr_evaluation/i18n/ca.po b/addons/hr_evaluation/i18n/ca.po
index 11f4c1054e5..ee477d358cb 100644
--- a/addons/hr_evaluation/i18n/ca.po
+++ b/addons/hr_evaluation/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-27 04:46+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/de.po b/addons/hr_evaluation/i18n/de.po
index 5136e1b3eb3..4c1596728a3 100644
--- a/addons/hr_evaluation/i18n/de.po
+++ b/addons/hr_evaluation/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -1068,102 +1068,3 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Next Evaluation"
-#~ msgstr "Anstehende Beurteilungen"
-
-#~ msgid "Date of the next evaluation"
-#~ msgstr "Datum nächste Beurteilung"
-
-#, python-format
-#~ msgid "''Regarding ''"
-#~ msgstr "'Bezüglich'"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Fehlerhafte Argumente"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#, python-format
-#~ msgid ""
-#~ "''\n"
-#~ "Date : %(date)s\n"
-#~ "\n"
-#~ "Dear %(employee_name)s,\n"
-#~ "\n"
-#~ "I am doing an evaluation regarding %(eval_name)s.\n"
-#~ "\n"
-#~ "Kindly submit your response.\n"
-#~ "\n"
-#~ "\n"
-#~ "Thanks,\n"
-#~ "--\n"
-#~ "%(user_signature)s\n"
-#~ "\n"
-#~ "        ''"
-#~ msgstr ""
-#~ "''\n"
-#~ "Datum : %(date)s\n"
-#~ "\n"
-#~ "Hallo  %(employee_name)s,\n"
-#~ "\n"
-#~ "wir erarbeiten eine Mitarbeiterbeurteilung für %(eval_name)s.\n"
-#~ "\n"
-#~ "Wir erbitten eine Rückmeldung.\n"
-#~ "\n"
-#~ "\n"
-#~ "Vielen Dank für die Mitarbeit\n"
-#~ "--\n"
-#~ "%(user_signature)s\n"
-#~ "\n"
-#~ "        ''"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
-#~ msgid ""
-#~ "Interview Requests are generated automatically by OpenERP according to "
-#~ "employees evaluation plan. Each user receives automatic emails and requests "
-#~ "to perform evaluation of their collegues periodically."
-#~ msgstr ""
-#~ "Mitarbeiterbeurteilungen werden automatisch in Abhängigkeit des "
-#~ "Bewertungsplans durch OpenERP erstellt. Jeder Benutzer erhält dabei "
-#~ "automatisch eine EMail von dem jeweils verantwortlichen Kollegen."
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "Each employee can be assigned to an evaluation plan. These plans define the "
-#~ "frequency and the way you manage your periodic personnal evaluation. You "
-#~ "will be able to define steps and attach interview forms to each step. "
-#~ "OpenERP manages all kind of evaluations: bottom-up, top-down, self "
-#~ "evaluation and final evaluation by the manager."
-#~ msgstr ""
-#~ "Jedem Mitarbeiter kann einem Mitarbeiterbewertungsverfahren zugewiesen sein. "
-#~ "Diese Beurteilungspläne definieren die Frequenz und Art der periodischen "
-#~ "Mitarbeiterbeurteilung. Es ist möglich einzelne Schritte dieses Verfahrens "
-#~ "zu definieren und dabei den Schritten Befragungsformulare zuzuweisen. "
-#~ "OpenERP ist für die Beurteilung flexibel hinsichtlich der Richtung: "
-#~ "Beurteilung von Vorgesetzten oder eine eigene Einstufung der Fähigkeiten ist "
-#~ "dabei genauso möglich wie die klassische Beurteilung von Mitarbeitern durch "
-#~ "deren Vorgesetzte. Abgeschlossen wird das Verfahren in der Regel durch eine "
-#~ "finale Beurteilung."
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr ""
-#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-#~ "vorhanden sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "After the Date of Start"
-#~ msgstr "Nach Startzeitpunkt"
-
-#~ msgid "Next Evaluation After"
-#~ msgstr "Nächst. Bewert. in"
diff --git a/addons/hr_evaluation/i18n/es.po b/addons/hr_evaluation/i18n/es.po
index 5a3143a46d8..26e130d2b98 100644
--- a/addons/hr_evaluation/i18n/es.po
+++ b/addons/hr_evaluation/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -1038,37 +1038,3 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de la acción."
-
-#~ msgid "Next Evaluation"
-#~ msgstr "Evaluación siguiente"
-
-#~ msgid ""
-#~ "Each employee can be assigned to an evaluation plan. These plans define the "
-#~ "frequency and the way you manage your periodic personnal evaluation. You "
-#~ "will be able to define steps and attach interview forms to each step. "
-#~ "OpenERP manages all kind of evaluations: bottom-up, top-down, self "
-#~ "evaluation and final evaluation by the manager."
-#~ msgstr ""
-#~ "Puede asignar cada empleado a un plan de evaluación. Estos planes definen la "
-#~ "frecuencia y la forma en la que gestiona sus evaluaciones personales "
-#~ "periodicas. Puede definir pasos y adjuntar formulario de entrevistas a cada "
-#~ "paso. OpenERP gestiona todo tipo de evaluaciones: de abajo a arriba, de "
-#~ "arriba a abajo, autoevaluación y evaluación final por el responsable."
-
-#~ msgid "Next Evaluation After"
-#~ msgstr "Siguente evaluación tras"
-
-#~ msgid ""
-#~ "Interview Requests are generated automatically by OpenERP according to "
-#~ "employees evaluation plan. Each user receives automatic emails and requests "
-#~ "to perform evaluation of their collegues periodically."
-#~ msgstr ""
-#~ "OpenERP genera automáticamente las peticiones de entrevista de acuerdo a los "
-#~ "planes de evaluación de los empleados. Cada usuario recibe correos "
-#~ "automáticos y peticiones para evaluar a sus compañeros periódicamente."
-
-#~ msgid "After the Date of Start"
-#~ msgstr "Después de la fecha de inicio"
-
-#~ msgid "Date of the next evaluation"
-#~ msgstr "Fecha de la próxima evaluación"
diff --git a/addons/hr_evaluation/i18n/es_EC.po b/addons/hr_evaluation/i18n/es_EC.po
index 0608ff9c1b7..0b92719ba9f 100644
--- a/addons/hr_evaluation/i18n/es_EC.po
+++ b/addons/hr_evaluation/i18n/es_EC.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/et.po b/addons/hr_evaluation/i18n/et.po
index 99e468a4328..cd2c69193bf 100644
--- a/addons/hr_evaluation/i18n/et.po
+++ b/addons/hr_evaluation/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/fi.po b/addons/hr_evaluation/i18n/fi.po
index e05ef673586..7aeb66ee732 100644
--- a/addons/hr_evaluation/i18n/fi.po
+++ b/addons/hr_evaluation/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/fr.po b/addons/hr_evaluation/i18n/fr.po
index 37a18e000d4..ab6b6b022f2 100644
--- a/addons/hr_evaluation/i18n/fr.po
+++ b/addons/hr_evaluation/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -952,44 +952,3 @@ msgstr ""
 
 #~ msgid "Evaluation Type"
 #~ msgstr "Type d'évaluation"
-
-#~ msgid "Next Evaluation"
-#~ msgstr "Prochaine évaluation"
-
-#~ msgid "After the Date of Start"
-#~ msgstr "Après la date de début"
-
-#~ msgid "Date of the next evaluation"
-#~ msgstr "Date de la prochaine évaluation"
-
-#~ msgid "Next Evaluation After"
-#~ msgstr "Prochaine évaluation après"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Les règles ne sont pas supportées par les objets osv_memory !"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Paramètres incorrects"
-
-#~ msgid ""
-#~ "Interview Requests are generated automatically by OpenERP according to "
-#~ "employees evaluation plan. Each user receives automatic emails and requests "
-#~ "to perform evaluation of their collegues periodically."
-#~ msgstr ""
-#~ "Les demandes d'interview sont générées automatiquement par OpenERP, selon le "
-#~ "plan d'évaluation des employés. Chaque utilisateur reçoit des messages "
-#~ "automatiques et demandes pour évaluer ses collègues périodiquement."
-
-#~ msgid ""
-#~ "Each employee can be assigned to an evaluation plan. These plans define the "
-#~ "frequency and the way you manage your periodic personnal evaluation. You "
-#~ "will be able to define steps and attach interview forms to each step. "
-#~ "OpenERP manages all kind of evaluations: bottom-up, top-down, self "
-#~ "evaluation and final evaluation by the manager."
-#~ msgstr ""
-#~ "Chaque employé peut être affecté à un plan d'évaluation. Ces plans "
-#~ "définissent la fréquence et la façon dont vous gérez votre propre évaluation "
-#~ "périodique. Vous pourrez définir des étapes et associer des formulaires "
-#~ "d'interview à chaque étape. OpenERP gère tous les types d'évaluations: de "
-#~ "bas en haut, de haut en bas, l'auto-évaluation et l'évaluation finale par le "
-#~ "gestionnaire."
diff --git a/addons/hr_evaluation/i18n/gl.po b/addons/hr_evaluation/i18n/gl.po
index c38030c6c8f..6ca0fc4bc94 100644
--- a/addons/hr_evaluation/i18n/gl.po
+++ b/addons/hr_evaluation/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/hr.po b/addons/hr_evaluation/i18n/hr.po
index 9cf7052ff8f..a1b81028681 100644
--- a/addons/hr_evaluation/i18n/hr.po
+++ b/addons/hr_evaluation/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/hu.po b/addons/hr_evaluation/i18n/hu.po
index 9936d5e47dd..b5591f03cc9 100644
--- a/addons/hr_evaluation/i18n/hu.po
+++ b/addons/hr_evaluation/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-03 17:36+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n"
+"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
+"<openerp@novotrade.hu>\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-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/id.po b/addons/hr_evaluation/i18n/id.po
index f048d8a0e34..c8ccebb53ea 100644
--- a/addons/hr_evaluation/i18n/id.po
+++ b/addons/hr_evaluation/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/it.po b/addons/hr_evaluation/i18n/it.po
index 4241fb86dba..46802ca0e5f 100644
--- a/addons/hr_evaluation/i18n/it.po
+++ b/addons/hr_evaluation/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -904,8 +904,5 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome del modello non valido nella definizione dell'azione."
 
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "La regola deve avere almento un diritto di accesso spuntato!"
-
 #~ msgid "Evaluation Type"
 #~ msgstr "Tipo valutazione"
diff --git a/addons/hr_evaluation/i18n/mn.po b/addons/hr_evaluation/i18n/mn.po
index 284e73663bc..589bd4d9195 100644
--- a/addons/hr_evaluation/i18n/mn.po
+++ b/addons/hr_evaluation/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -1019,92 +1019,11 @@ msgstr ""
 #~ msgid "Apply to categories"
 #~ msgstr "Хүсэлт гаргах зэрэглэл"
 
-#~ msgid "Next Evaluation"
-#~ msgstr "Дараагийн үнэлгээ"
-
-#~ msgid "After the Date of Start"
-#~ msgstr "Эхлэх огнооноос хэдэн сарын дараа"
-
-#~ msgid "Date of the next evaluation"
-#~ msgstr "Дараагийн үнэлгээ хийх огноо"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Буруу параметер"
-
-#~ msgid "Next Evaluation After"
-#~ msgstr "Дараагийн үнэлгээ хүртэлх хугацаа"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа ! Рекурс цэс үүсгэж болохгүй"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "osv_memory обьект нь дүрмийг дэмжихгүй"
-
-#~ msgid ""
-#~ "Each employee can be assigned to an evaluation plan. These plans define the "
-#~ "frequency and the way you manage your periodic personnal evaluation. You "
-#~ "will be able to define steps and attach interview forms to each step. "
-#~ "OpenERP manages all kind of evaluations: bottom-up, top-down, self "
-#~ "evaluation and final evaluation by the manager."
-#~ msgstr ""
-#~ "Ажилтан бүрийг үнэлгээний төлөвлөгөөнд оноож болно. Энэ төлөвлөгөө нь таны "
-#~ "хувийн үечилсэн үнэлгээгээ удирдаж түүний давтамжийг тодорхойлно. Алхмуудыг "
-#~ "тодорхойлж алхам бүрт ярилцлагын маягтыг холбож өгч болно. Доороос дээш, "
-#~ "дээрээс доош, өөрийн ба менежерээр эцсийн үнэлнээ зэрэг бүх төрлийн үнэлгээг "
-#~ "зохицуулах боломжтой."
-
 #~ msgid "Status"
 #~ msgstr "Төлөв"
 
 #~ msgid "Appliable Role"
 #~ msgstr "Тохирох дүр"
 
-#~ msgid ""
-#~ "Interview Requests are generated automatically by OpenERP according to "
-#~ "employees evaluation plan. Each user receives automatic emails and requests "
-#~ "to perform evaluation of their collegues periodically."
-#~ msgstr ""
-#~ "Ажилтны үнэлгээний төлөвлөгөөний дагуу ярилцлагын хүсэлт нь автоматаар "
-#~ "үүснэ. Хэрэглэгч бүр автомат э-мэйл хүлээн авах ба өөрийн хамтран "
-#~ "ажиллагсдын үнэлгээ үе шаттайгаар хийнэ."
-
 #~ msgid "Quotations"
 #~ msgstr "Үнийн санал"
-
-#, python-format
-#~ msgid "''Regarding ''"
-#~ msgstr "\"Хамааруулахад\""
-
-#, python-format
-#~ msgid ""
-#~ "''\n"
-#~ "Date : %(date)s\n"
-#~ "\n"
-#~ "Dear %(employee_name)s,\n"
-#~ "\n"
-#~ "I am doing an evaluation regarding %(eval_name)s.\n"
-#~ "\n"
-#~ "Kindly submit your response.\n"
-#~ "\n"
-#~ "\n"
-#~ "Thanks,\n"
-#~ "--\n"
-#~ "%(user_signature)s\n"
-#~ "\n"
-#~ "        ''"
-#~ msgstr ""
-#~ "''\n"
-#~ "Огноо : %(date)s\n"
-#~ "\n"
-#~ "Эрхэм %(employee_name)s,\n"
-#~ "\n"
-#~ "Дараах үнэлгээний дагуу би үнэлж байна %(eval_name)s.\n"
-#~ "\n"
-#~ "Хариугаа илгээнэ үү .\n"
-#~ "\n"
-#~ "\n"
-#~ "Баярлалаа,\n"
-#~ "--\n"
-#~ "%(user_signature)s\n"
-#~ "\n"
-#~ "        ''"
diff --git a/addons/hr_evaluation/i18n/nl.po b/addons/hr_evaluation/i18n/nl.po
index 04d71aeafc6..92ff37a9c54 100644
--- a/addons/hr_evaluation/i18n/nl.po
+++ b/addons/hr_evaluation/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -1063,97 +1063,3 @@ msgstr ""
 
 #~ msgid "Evaluation Type"
 #~ msgstr "Beoordelingsoort"
-
-#~ msgid "Next Evaluation"
-#~ msgstr "Volgende beoordeling"
-
-#~ msgid "After the Date of Start"
-#~ msgstr "Na de startdaum"
-
-#~ msgid "Date of the next evaluation"
-#~ msgstr "Datum volgende beoordeling"
-
-#, python-format
-#~ msgid "''Regarding ''"
-#~ msgstr "\"Betreft\""
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Ongeldige argumenten"
-
-#~ msgid "Next Evaluation After"
-#~ msgstr "Volgende beoordeling na"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#, python-format
-#~ msgid ""
-#~ "''\n"
-#~ "Date : %(date)s\n"
-#~ "\n"
-#~ "Dear %(employee_name)s,\n"
-#~ "\n"
-#~ "I am doing an evaluation regarding %(eval_name)s.\n"
-#~ "\n"
-#~ "Kindly submit your response.\n"
-#~ "\n"
-#~ "\n"
-#~ "Thanks,\n"
-#~ "--\n"
-#~ "%(user_signature)s\n"
-#~ "\n"
-#~ "        ''"
-#~ msgstr ""
-#~ "''\n"
-#~ "Datum : %(date)s\n"
-#~ "\n"
-#~ "Beste %(employee_name)s,\n"
-#~ "\n"
-#~ "Ik ben bezig met een beoordeling betreffende %(eval_name)s.\n"
-#~ "\n"
-#~ "Graag ontvang ik je reactie.\n"
-#~ "\n"
-#~ "\n"
-#~ "Bedankt,\n"
-#~ "--\n"
-#~ "%(user_signature)s\n"
-#~ "\n"
-#~ "        ''"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regels worden niet ondersteund bij osv_memory objecten !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Regel moet tenminste één toegangsrecht aangevinkt hebben !"
-
-#~ msgid ""
-#~ "Interview Requests are generated automatically by OpenERP according to "
-#~ "employees evaluation plan. Each user receives automatic emails and requests "
-#~ "to perform evaluation of their collegues periodically."
-#~ msgstr ""
-#~ "Gespreksaanvragen worden automatisch door OpenERP gegenereerd volgens het "
-#~ "beoordelingsplan van de medewerker. Elke gebruiker ontvangt automatisch e-"
-#~ "mails en aanvragen om periodiek beoordelingen  van hun collega's uit te "
-#~ "voeren."
-
-#~ msgid ""
-#~ "Each employee can be assigned to an evaluation plan. These plans define the "
-#~ "frequency and the way you manage your periodic personnal evaluation. You "
-#~ "will be able to define steps and attach interview forms to each step. "
-#~ "OpenERP manages all kind of evaluations: bottom-up, top-down, self "
-#~ "evaluation and final evaluation by the manager."
-#~ msgstr ""
-#~ "Elke medewerker kan worden toegewezen aan een beoordelingsplan. Deze plannen "
-#~ "definiëren de frequentie en manier waarop periodieke beoordelingen "
-#~ "plaatsvinden. U kunt stappen definiëren en vragenformulieren toewijzen aan "
-#~ "elke stap. OpenERP beheert allerlei soorten beoordelingen: bottom-up, top-"
-#~ "down, zelfbeoordeling en eindbeoordeling door manager."
diff --git a/addons/hr_evaluation/i18n/pt.po b/addons/hr_evaluation/i18n/pt.po
index 7627e094d28..88f69b4ab37 100644
--- a/addons/hr_evaluation/i18n/pt.po
+++ b/addons/hr_evaluation/i18n/pt.po
@@ -14,14 +14,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Plan In Progress"
-msgstr ""
+msgstr "Plano em curso"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,wait:0
@@ -56,7 +56,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Legend"
-msgstr ""
+msgstr "Legenda"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:311
@@ -113,12 +113,12 @@ msgstr "Dia"
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,evaluation_id:0
 msgid "Evaluation Form"
-msgstr ""
+msgstr "Formulário de avaliação"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
-msgstr ""
+msgstr "Eviar um resumo anónimo ao empregado"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan,month_first:0
@@ -142,29 +142,30 @@ msgstr "Pedido de entrevista"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Erro! Não pode seleccionar um departamento cujo gestor é o empregado."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Mail Body"
-msgstr ""
+msgstr "Conteúdo do e-mail"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_report_all
 #: model:ir.ui.menu,name:hr_evaluation.menu_evaluation_report_all
 msgid "Evaluations Analysis"
-msgstr ""
+msgstr "Análise das avaliações"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_reminder
 msgid "Sends Reminders to employess to fill the evaluations"
-msgstr ""
+msgstr "Enviar aos empregados lembretes para o preenchimento das avaliações"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
@@ -175,7 +176,7 @@ msgstr "Não correspondeu às expetativas"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal"
-msgstr ""
+msgstr "Avaliação"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -185,7 +186,7 @@ msgstr "Julho"
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_next:0
 msgid "Periodicity of Evaluations (months)"
-msgstr ""
+msgstr "periodicidade das avaliações (meses)"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:242
@@ -203,7 +204,7 @@ msgstr "Data de fim"
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_first:0
 msgid "First Evaluation in (months)"
-msgstr ""
+msgstr "Primeira avaliação em (meses)"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:81
@@ -229,7 +230,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Send to Employees"
-msgstr ""
+msgstr "Enviar para os empregados"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,deadline:0
@@ -251,12 +252,12 @@ msgstr ""
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
 msgid "Periodic Evaluations"
-msgstr ""
+msgstr "Avaliações periódicas"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 msgid "Send evaluation reminder"
-msgstr ""
+msgstr "Enviar lembrete da avaliação"
 
 #. module: hr_evaluation
 #: model:ir.module.module,description:hr_evaluation.module_meta_information
@@ -279,7 +280,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(date)s: Current Date"
-msgstr ""
+msgstr "(data)s: Data atual"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:80
@@ -313,7 +314,7 @@ msgstr "Empregado"
 #. module: hr_evaluation
 #: field:hr.evaluation.report,overpass_delay:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Prazo ultrapassado"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_body:0
@@ -347,12 +348,12 @@ msgstr "    Mês-1    "
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Public Notes"
-msgstr ""
+msgstr "Notas públicas"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date:0
 msgid "Evaluation Deadline"
-msgstr ""
+msgstr "Prazo da avaliação"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -363,7 +364,7 @@ msgstr "Imprimir a entrevista"
 #. module: hr_evaluation
 #: field:hr.evaluation.report,closed:0
 msgid "closed"
-msgstr ""
+msgstr "fechado"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
@@ -412,7 +413,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Ending Summary"
-msgstr ""
+msgstr "Resumo final"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
@@ -481,7 +482,7 @@ msgstr "É uma avaliação?"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_survey_request
 msgid "survey.request"
-msgstr ""
+msgstr "survey.request"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,wait:0
@@ -513,13 +514,13 @@ msgstr "Rascunho"
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,note_summary:0
 msgid "Evaluation Summary"
-msgstr ""
+msgstr "Resumo da avaliação"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,send_anonymous_employee:0
 #: field:hr_evaluation.plan.phase,send_anonymous_manager:0
 msgid "Anonymous Summary"
-msgstr ""
+msgstr "Resumo anónimo"
 
 #. module: hr_evaluation
 #: view:hr.employee:0
@@ -550,7 +551,7 @@ msgstr "Iniciar a avaliação"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "To Do"
-msgstr ""
+msgstr "A fazer"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -579,7 +580,7 @@ msgstr "Plano"
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,active:0
 msgid "Active"
-msgstr ""
+msgstr "Ativo"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -589,12 +590,12 @@ msgstr "Novembro"
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros avançados..."
 
 #. module: hr_evaluation
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Erro! Não pode criar hierarquias de funcionários com recursividade."
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -609,12 +610,12 @@ msgstr "Janeiro"
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 msgid "Send Mail"
-msgstr ""
+msgstr "Enviar e-mail"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
 msgid "Send an anonymous summary to the manager"
-msgstr ""
+msgstr "Enviar um resumo anónimo para o gerente"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -636,7 +637,7 @@ msgstr "Data"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Survey"
-msgstr ""
+msgstr "Inquérito"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.evaluation,rating:0
@@ -652,7 +653,7 @@ msgstr "Ação"
 #: view:hr.evaluation.report:0
 #: selection:hr.evaluation.report,state:0
 msgid "Final Validation"
-msgstr ""
+msgstr "Validação final"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.evaluation,state:0
@@ -662,12 +663,12 @@ msgstr ""
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_feature:0
 msgid "Send mail for this phase"
-msgstr ""
+msgstr "Envial e-mail para esta fase"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,rating:0
 msgid "Overall Rating"
-msgstr ""
+msgstr "Pontuação global"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -684,12 +685,12 @@ msgstr "Entrevistador"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_report
 msgid "Evaluations Statistics"
-msgstr ""
+msgstr "Estatísticas das avaliações"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Deadline Date"
-msgstr ""
+msgstr "Prazo limite"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
@@ -699,7 +700,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "General"
-msgstr ""
+msgstr "Geral"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_employee:0
@@ -709,7 +710,7 @@ msgstr "Enviar ao empregado todas as respostas"
 #. module: hr_evaluation
 #: field:hr.employee,evaluation_date:0
 msgid "Next Evaluation Date"
-msgstr ""
+msgstr "Data da próxima avaliação"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -717,18 +718,18 @@ msgstr ""
 #: view:hr_evaluation.evaluation:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Done"
-msgstr ""
+msgstr "Feito"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Evaluation Plan Phases"
-msgstr ""
+msgstr "Fases do plano de avaliação"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 #: view:hr_evaluation.evaluation:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -757,7 +758,7 @@ msgstr "Atual"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_interview
 msgid "Evaluation Interview"
-msgstr ""
+msgstr "Entrevista de avaliação"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.reminder,evaluation_id:0
@@ -768,12 +769,12 @@ msgstr "Entrevista"
 #: view:hr.evaluation.reminder:0
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_send_mail
 msgid "Evaluation Reminders"
-msgstr ""
+msgstr "Lembretes da avaliação"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Self Appraisal Requests"
-msgstr ""
+msgstr "Pedidos de auto-avaliação"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,email_subject:0
@@ -905,29 +906,11 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de modelo inválido na definição da ação."
 
-#~ msgid "Date of the next evaluation"
-#~ msgstr "Data da próxima avaliação"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para a arquitetura de vista"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivos."
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "O nome do Objeto deve começar com x_ e não pode conter nenhum caracter "
 #~ "especial!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "O objecto osv_memory não suporta regras!"
diff --git a/addons/hr_evaluation/i18n/pt_BR.po b/addons/hr_evaluation/i18n/pt_BR.po
index c39ca9d1a16..a3291e45b9c 100644
--- a/addons/hr_evaluation/i18n/pt_BR.po
+++ b/addons/hr_evaluation/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/ru.po b/addons/hr_evaluation/i18n/ru.po
index 96cb0010d4c..a2951c117eb 100644
--- a/addons/hr_evaluation/i18n/ru.po
+++ b/addons/hr_evaluation/i18n/ru.po
@@ -14,14 +14,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-28 04:40+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Plan In Progress"
-msgstr ""
+msgstr "Выполнение плана"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,wait:0
@@ -51,18 +51,18 @@ msgstr "Выполнено"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_evaluation_tree
 msgid "My Evaluation Remaining"
-msgstr ""
+msgstr "Мои оставшиеся собеседования"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Legend"
-msgstr ""
+msgstr "Обозначения"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:311
 #, python-format
 msgid "You cannot start evaluation without Evaluation."
-msgstr ""
+msgstr "Нельзя начать собеседование без Собеседования"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -163,12 +163,12 @@ msgstr "Анализ испытаний"
 #: selection:hr.evaluation.report,state:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Отменено"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_reminder
 msgid "Sends Reminders to employess to fill the evaluations"
-msgstr ""
+msgstr "Отправляет напоминания сотрудникам о прохождении собеседования"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
@@ -179,12 +179,12 @@ msgstr "Не оправдал ожиданий"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal"
-msgstr ""
+msgstr "Рецензент"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Июль"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_next:0
@@ -198,11 +198,13 @@ msgid ""
 "You cannot change state, because some appraisal in waiting answer or draft "
 "state"
 msgstr ""
+"Нельзя изменить состояние: некоторые рецензенты находятся в состоянии "
+"\"Ожидается ответ\" или \"Черновик\""
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date_close:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Дата окончания"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_first:0
@@ -229,6 +231,21 @@ msgid ""
 "\n"
 "        "
 msgstr ""
+"\n"
+"Дата: %(date)s\n"
+"\n"
+"Уважаемый %(employee_name)s,\n"
+"\n"
+"Я провожу собеседование %(eval_name)s.\n"
+"\n"
+"Отправьте, пожалуйста, ваш ответ.\n"
+"\n"
+"\n"
+"С благодарностью,\n"
+"--\n"
+"%(user_signature)s\n"
+"\n"
+"        "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -238,29 +255,29 @@ msgstr "Отправить сотрудникам"
 #. module: hr_evaluation
 #: field:hr.evaluation.report,deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Последний срок"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid " Month "
-msgstr ""
+msgstr " Месяц "
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan,month_next:0
 msgid ""
 "The number of month that depicts the delay between each evaluation of this "
 "plan (after the first one)."
-msgstr ""
+msgstr "Число месяцев между собеседованиями по этому плану (после первого)"
 
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
 msgid "Periodic Evaluations"
-msgstr ""
+msgstr "Периодические собеседования"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 msgid "Send evaluation reminder"
-msgstr ""
+msgstr "Отправить напоминание о собеседовании"
 
 #. module: hr_evaluation
 #: model:ir.module.module,description:hr_evaluation.module_meta_information
@@ -283,7 +300,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(date)s: Current Date"
-msgstr ""
+msgstr "(date)s: Текущая дата"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:80
@@ -303,7 +320,7 @@ msgstr "Статус"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan_phase
 msgid "Evaluation Plan Phase"
-msgstr ""
+msgstr "Этап плана тестирования"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -317,12 +334,12 @@ msgstr "Сотрудник"
 #. module: hr_evaluation
 #: field:hr.evaluation.report,overpass_delay:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Просрочено"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_body:0
 msgid "Email"
-msgstr ""
+msgstr "Письмо"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
@@ -346,12 +363,12 @@ msgstr "Отправить все ответы менеджеру"
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Месяц-1    "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Public Notes"
-msgstr ""
+msgstr "Общедоступные примечания"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date:0
@@ -367,7 +384,7 @@ msgstr "Распечатать собеседование"
 #. module: hr_evaluation
 #: field:hr.evaluation.report,closed:0
 msgid "closed"
-msgstr ""
+msgstr "закрыто"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
@@ -415,7 +432,7 @@ msgstr "План действия"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(eval_name)s:Evaluation Name"
-msgstr ""
+msgstr "(eval_name)s: Название тестирования"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -431,7 +448,7 @@ msgstr "Значительно превосходит ожидания"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "In progress"
-msgstr ""
+msgstr "Выполняется"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,send_answer_employee:0
@@ -442,18 +459,18 @@ msgstr "Все ответы"
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Сентябрь"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Декабрь"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Месяц"
 
 #. module: hr_evaluation
 #: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
@@ -463,7 +480,7 @@ msgstr "Оценка человеческих ресурсов"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Group by..."
-msgstr ""
+msgstr "Объединять по..."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -511,6 +528,7 @@ msgid ""
 "If the evaluation does not meet the expectations, you can proposean action "
 "plan"
 msgstr ""
+"Если тестирование не совпадает с ожиданиями, можно предложить план действий."
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -538,17 +556,17 @@ msgstr "Оценка"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "7 Days"
-msgstr ""
+msgstr "7 дней"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid " Year "
-msgstr ""
+msgstr " Год "
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Август"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -558,12 +576,12 @@ msgstr "Начало испытания"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "To Do"
-msgstr ""
+msgstr "Сделать"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Июнь"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
@@ -574,7 +592,7 @@ msgstr "Значительно ниже ожиданий"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid " (employee_name)s: Partner name"
-msgstr ""
+msgstr " (employee_name)s: Наименование контрагента"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -582,42 +600,42 @@ msgstr ""
 #: view:hr_evaluation.evaluation:0
 #: field:hr_evaluation.evaluation,plan_id:0
 msgid "Plan"
-msgstr ""
+msgstr "План"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,active:0
 msgid "Active"
-msgstr ""
+msgstr "Активно"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Ноябрь"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Расширенные фильтры..."
 
 #. module: hr_evaluation
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Ошибка! Структура подчинения не может быть рекурсивной."
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Октябрь"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 msgid "Send Mail"
-msgstr ""
+msgstr "Отправить письмо"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -644,17 +662,17 @@ msgstr "Дата"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Survey"
-msgstr ""
+msgstr "Опрос"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.evaluation,rating:0
 msgid "This is the appreciation on that summarize the evaluation"
-msgstr ""
+msgstr "Это суммарная оценка тестирования"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
-msgstr ""
+msgstr "Действие"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -681,7 +699,7 @@ msgstr "Общий рейтинг"
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Late"
-msgstr ""
+msgstr "С опозданием"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -707,7 +725,7 @@ msgstr "Запросы на оценку сверху вниз"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "General"
-msgstr ""
+msgstr "Основная"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_employee:0
@@ -725,7 +743,7 @@ msgstr "Следующая дата испытания"
 #: view:hr_evaluation.evaluation:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Done"
-msgstr ""
+msgstr "Выполнено"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -736,12 +754,12 @@ msgstr "Фазы плана оценки"
 #: view:hr.evaluation.reminder:0
 #: view:hr_evaluation.evaluation:0
 msgid "Cancel"
-msgstr ""
+msgstr "Отменено"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "In Progress"
-msgstr ""
+msgstr "Выполняется"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
@@ -750,58 +768,61 @@ msgid ""
 "employee's evaluation plan. Each user receives automatic emails and requests "
 "to evaluate their colleagues periodically."
 msgstr ""
+"Запросы на собеседование генерируются OpenERP автоматически в соотвествии с "
+"планом тестирования сотрудника. Каждый пользователь периодически получает "
+"автоматические сообщения и запросы на тестирование своих коллег."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 #: field:hr_evaluation.plan,phase_ids:0
 msgid "Evaluation Phases"
-msgstr ""
+msgstr "Этапы тестирования"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Current"
-msgstr ""
+msgstr "Текущий"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_interview
 msgid "Evaluation Interview"
-msgstr ""
+msgstr "Тестовое собеседование"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.reminder,evaluation_id:0
 msgid "Interview"
-msgstr ""
+msgstr "Собеседование"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_send_mail
 msgid "Evaluation Reminders"
-msgstr ""
+msgstr "Напоминания о тестировании"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Self Appraisal Requests"
-msgstr ""
+msgstr "Запросы самооценки"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,email_subject:0
 msgid "char"
-msgstr ""
+msgstr "char"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,survey_request_ids:0
 msgid "Appraisal Forms"
-msgstr ""
+msgstr "Формы оценки"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Май"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Внутренние примечания"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -816,7 +837,7 @@ msgstr "Завершающее собеседование"
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,name:0
 msgid "Phase"
-msgstr ""
+msgstr "Этап"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
@@ -841,7 +862,7 @@ msgstr "План оценки"
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Февраль"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -851,12 +872,12 @@ msgstr "Отправить менеджерам"
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_send_mail
 msgid "Evaluation Send Mail"
-msgstr ""
+msgstr "Отправить письмо"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Апрель"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
@@ -871,17 +892,17 @@ msgstr "Поиск по плану оценки"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 msgid "(months)"
-msgstr ""
+msgstr "(months)"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Последовательность"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(user_signature)s: User name"
-msgstr ""
+msgstr "(user_signature)s: Имя пользователя"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_interview_tree
@@ -892,13 +913,13 @@ msgstr "Запросы на собеседование"
 #. module: hr_evaluation
 #: field:hr.evaluation.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Год"
 
 #. module: hr_evaluation
 #: help:hr.employee,evaluation_date:0
diff --git a/addons/hr_evaluation/i18n/sr.po b/addons/hr_evaluation/i18n/sr.po
index cdf785ca7e1..212d998b668 100644
--- a/addons/hr_evaluation/i18n/sr.po
+++ b/addons/hr_evaluation/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/sr@latin.po b/addons/hr_evaluation/i18n/sr@latin.po
index 8de98bc24f3..a8149bebea9 100644
--- a/addons/hr_evaluation/i18n/sr@latin.po
+++ b/addons/hr_evaluation/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/sv.po b/addons/hr_evaluation/i18n/sv.po
index f6d06c515b7..b2f86efde2f 100644
--- a/addons/hr_evaluation/i18n/sv.po
+++ b/addons/hr_evaluation/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/tr.po b/addons/hr_evaluation/i18n/tr.po
index 562d4ba4d4d..ae5ce22be8c 100644
--- a/addons/hr_evaluation/i18n/tr.po
+++ b/addons/hr_evaluation/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-24 04:37+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
diff --git a/addons/hr_evaluation/i18n/zh_CN.po b/addons/hr_evaluation/i18n/zh_CN.po
index 103477b45dd..62704af7bc6 100644
--- a/addons/hr_evaluation/i18n/zh_CN.po
+++ b/addons/hr_evaluation/i18n/zh_CN.po
@@ -9,123 +9,123 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-08-03 06:44+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@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-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Plan In Progress"
-msgstr ""
+msgstr "计划进度"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,wait:0
 msgid "Wait Previous Phases"
-msgstr ""
+msgstr "等待前面的阶段"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr.evaluation.report:0
 #: view:hr_evaluation.plan:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组..."
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,request_id:0
 #: field:hr.evaluation.report,request_id:0
 msgid "Request_id"
-msgstr ""
+msgstr "要求ID"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,progress_bar:0
 #: field:hr_evaluation.evaluation,progress:0
 msgid "Progress"
-msgstr ""
+msgstr "进度"
 
 #. module: hr_evaluation
 #: view:board.board:0
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_evaluation_tree
 msgid "My Evaluation Remaining"
-msgstr ""
+msgstr "我的考评还有"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Legend"
-msgstr ""
+msgstr "图表"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:311
 #, python-format
 msgid "You cannot start evaluation without Evaluation."
-msgstr ""
+msgstr "您不能开启在考评范围外的考评"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "March"
-msgstr ""
+msgstr "3月"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,delay_date:0
 msgid "Delay to Start"
-msgstr ""
+msgstr "推延开启"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr_evaluation.evaluation,rating:0
 msgid "Appreciation"
-msgstr ""
+msgstr "评价"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:242
 #: code:addons/hr_evaluation/hr_evaluation.py:311
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "警告！"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 #: field:hr_evaluation.plan,company_id:0
 #: field:hr_evaluation.plan.phase,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
 msgid "Evaluation Interviews"
-msgstr ""
+msgstr "考评面谈"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,survey_id:0
 msgid "Appraisal Form"
-msgstr ""
+msgstr "评价表"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "天数"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,evaluation_id:0
 msgid "Evaluation Form"
-msgstr ""
+msgstr "考评表"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
-msgstr ""
+msgstr "给员工发一个匿名摘要"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan,month_first:0
 msgid ""
 "This number of months will be used to schedule the first evaluation date of "
 "the employee when selecting an evaluation plan. "
-msgstr ""
+msgstr "这个月份将在选择的考评计划里对员工进行首次考评。 "
 
 #. module: hr_evaluation
 #: view:hr.employee:0
@@ -135,57 +135,57 @@ msgstr "备注"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Interview Request"
-msgstr ""
+msgstr "面谈要求"
 
 #. module: hr_evaluation
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "错误！您不用为他选择一部门因为他是总经理(CEO)。"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Mail Body"
-msgstr ""
+msgstr "邮件内容"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_report_all
 #: model:ir.ui.menu,name:hr_evaluation.menu_evaluation_report_all
 msgid "Evaluations Analysis"
-msgstr ""
+msgstr "考评分析"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_reminder
 msgid "Sends Reminders to employess to fill the evaluations"
-msgstr ""
+msgstr "给员工发送提醒去完成考评"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Did not meet expectations"
-msgstr ""
+msgstr "没有达到预期"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal"
-msgstr ""
+msgstr "评价"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_next:0
 msgid "Periodicity of Evaluations (months)"
-msgstr ""
+msgstr "考评周期（月）"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:242
@@ -193,17 +193,17 @@ msgstr ""
 msgid ""
 "You cannot change state, because some appraisal in waiting answer or draft "
 "state"
-msgstr ""
+msgstr "您不能修改状态，因为有一些评价处于等待回复或草稿状态。"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date_close:0
 msgid "Ending Date"
-msgstr ""
+msgstr "结束日期"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_first:0
 msgid "First Evaluation in (months)"
-msgstr ""
+msgstr "首次考评在(月)"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:81
@@ -225,38 +225,50 @@ msgid ""
 "\n"
 "        "
 msgstr ""
+"\n"
+"日期: %(date)s\n"
+"\n"
+"您好 %(employee_name)s \n"
+"\n"
+"我需要做一个关于 %(eval_name)s 的考评，请您回复答案。\n"
+"\n"
+"谢谢\n"
+"\n"
+"%(user_signature)s\n"
+"\n"
+"        "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Send to Employees"
-msgstr ""
+msgstr "发送给员工"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "截止日期"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid " Month "
-msgstr ""
+msgstr " 月份 "
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan,month_next:0
 msgid ""
 "The number of month that depicts the delay between each evaluation of this "
 "plan (after the first one)."
-msgstr ""
+msgstr "这个月份数字描述了计划中每次考评的间距（首次之后）"
 
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
 msgid "Periodic Evaluations"
-msgstr ""
+msgstr "考评周期"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 msgid "Send evaluation reminder"
-msgstr ""
+msgstr "发送考评提醒"
 
 #. module: hr_evaluation
 #: model:ir.module.module,description:hr_evaluation.module_meta_information
@@ -275,17 +287,23 @@ msgid ""
 "          in the form of.Implements a dashboard for My Current Evaluations\n"
 "         "
 msgstr ""
+"\n"
+"          能创建员工的考评。\n"
+"    可以对经理下的下属员工进行考评。\n"
+"    考评可以在计划创建不同的问卷并且它能定义不同级别的员工填写，最后由经理做审核。\n"
+"    在我当前的考评中里可以看到员工填写的每一个考评。\n"
+"         "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(date)s: Current Date"
-msgstr ""
+msgstr "(date)s: 当前日期"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:80
 #, python-format
 msgid "Regarding "
-msgstr ""
+msgstr "关于 "
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -299,7 +317,7 @@ msgstr "状态"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan_phase
 msgid "Evaluation Plan Phase"
-msgstr ""
+msgstr "考评计划阶段"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -313,74 +331,74 @@ msgstr "员工"
 #. module: hr_evaluation
 #: field:hr.evaluation.report,overpass_delay:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "超过截止日期"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_body:0
 msgid "Email"
-msgstr ""
+msgstr "电子邮件"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Exceeds expectations"
-msgstr ""
+msgstr "超过预期"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,mail_feature:0
 msgid ""
 "Check this box if you want to send mail to employees coming under this phase"
-msgstr ""
+msgstr "如果您想在这阶段发送电子邮件给员工，勾选"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_manager:0
 msgid "Send all answers to the manager"
-msgstr ""
+msgstr "发送所有的答案给经理"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    上月    "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Public Notes"
-msgstr ""
+msgstr "公开备注"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date:0
 msgid "Evaluation Deadline"
-msgstr ""
+msgstr "考评截止日期"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Print Interview"
-msgstr ""
+msgstr "打印面谈"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,closed:0
 msgid "closed"
-msgstr ""
+msgstr "已结束"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Meet expectations"
-msgstr ""
+msgstr "达到预期目标"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,nbr:0
 msgid "# of Requests"
-msgstr ""
+msgstr "# 要求"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_tree
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_tree
 msgid "Evaluations"
-msgstr "考核"
+msgstr "考评"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.open_view_hr_evaluation_tree
@@ -391,114 +409,116 @@ msgid ""
 "manages all kind of evaluations: bottom-up, top-down, self-evaluation and "
 "final evaluation by the manager."
 msgstr ""
+"每个员工可以指派一个考评计划。在计划里可以定义您管理的周期性考评的方式和次数。您可以定义每个阶段的步骤和附加的面谈。系统管理所有考评的类型： "
+"自上而下，自下而上，自我考评和经理最后考评。"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Action to Perform"
-msgstr ""
+msgstr "要执行的操作"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,note_action:0
 msgid "Action Plan"
-msgstr ""
+msgstr "行动计划"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(eval_name)s:Evaluation Name"
-msgstr ""
+msgstr "(eval_name)s: 考评名称"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Ending Summary"
-msgstr ""
+msgstr "结束总结"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Significantly exceeds expectations"
-msgstr ""
+msgstr "大大超过预期"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "In progress"
-msgstr ""
+msgstr "进行中"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,send_answer_employee:0
 #: field:hr_evaluation.plan.phase,send_answer_manager:0
 msgid "All Answers"
-msgstr ""
+msgstr "所有答案"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "月份"
 
 #. module: hr_evaluation
 #: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
 msgid "Human Resources Evaluation"
-msgstr "人力资源考核"
+msgstr "人力资源考评"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Group by..."
-msgstr ""
+msgstr "分组"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Mail Settings"
-msgstr ""
+msgstr "邮件设置"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,user_to_review_id:0
 msgid "Employee to Interview"
-msgstr ""
+msgstr "面谈员工"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Interview Question"
-msgstr ""
+msgstr "面谈问题"
 
 #. module: hr_evaluation
 #: field:survey.request,is_evaluation:0
 msgid "Is Evaluation?"
-msgstr ""
+msgstr "进行考评？"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_survey_request
 msgid "survey.request"
-msgstr ""
+msgstr "survey.request"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,wait:0
 msgid ""
 "Check this box if you want to wait that all preceding phases are finished "
 "before launching this phase."
-msgstr ""
+msgstr "如果您要等前面所有阶段都完成才开启这阶段，勾选"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Evaluation Data"
-msgstr ""
+msgstr "考评日期"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.evaluation,note_action:0
 msgid ""
 "If the evaluation does not meet the expectations, you can proposean action "
 "plan"
-msgstr ""
+msgstr "如果考评不符合期望，您可以终止这计划。"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -509,60 +529,60 @@ msgstr "草稿"
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,note_summary:0
 msgid "Evaluation Summary"
-msgstr ""
+msgstr "考评总结"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,send_anonymous_employee:0
 #: field:hr_evaluation.plan.phase,send_anonymous_manager:0
 msgid "Anonymous Summary"
-msgstr ""
+msgstr "匿名摘要"
 
 #. module: hr_evaluation
 #: view:hr.employee:0
 #: view:hr_evaluation.evaluation:0
 msgid "Evaluation"
-msgstr "考核"
+msgstr "考评"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "7 Days"
-msgstr ""
+msgstr "7天"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid " Year "
-msgstr ""
+msgstr " 年 "
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Start Evaluation"
-msgstr ""
+msgstr "开始考评"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "To Do"
-msgstr ""
+msgstr "待处理"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Significantly bellow expectations"
-msgstr ""
+msgstr "大大低于期望"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid " (employee_name)s: Partner name"
-msgstr ""
+msgstr " (employee_name)s: 业务伙伴名称"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -570,7 +590,7 @@ msgstr ""
 #: view:hr_evaluation.evaluation:0
 #: field:hr_evaluation.evaluation,plan_id:0
 msgid "Plan"
-msgstr ""
+msgstr "计划"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,active:0
@@ -580,49 +600,49 @@ msgstr "有效"
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "增加筛选条件"
 
 #. module: hr_evaluation
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "错误！您不能创建循环的员工等级。"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 msgid "Send Mail"
-msgstr ""
+msgstr "发送邮件"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
 msgid "Send an anonymous summary to the manager"
-msgstr ""
+msgstr "发送匿名摘要给经理"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Interview Evaluation"
-msgstr ""
+msgstr "考评面谈"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_plan_tree
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_plan_tree
 msgid "Evaluation Plans"
-msgstr ""
+msgstr "考评计划"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -632,80 +652,80 @@ msgstr "日期"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Survey"
-msgstr ""
+msgstr "问卷"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.evaluation,rating:0
 msgid "This is the appreciation on that summarize the evaluation"
-msgstr ""
+msgstr "这评价是这考评的总结"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
-msgstr ""
+msgstr "操作"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: selection:hr.evaluation.report,state:0
 msgid "Final Validation"
-msgstr ""
+msgstr "最终确认"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Waiting Appreciation"
-msgstr ""
+msgstr "等待评价"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_feature:0
 msgid "Send mail for this phase"
-msgstr ""
+msgstr "这阶段发送邮件"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,rating:0
 msgid "Overall Rating"
-msgstr ""
+msgstr "总评分"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Late"
-msgstr ""
+msgstr "最近"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Interviewer"
-msgstr ""
+msgstr "面谈主持"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_report
 msgid "Evaluations Statistics"
-msgstr ""
+msgstr "考评统计"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Deadline Date"
-msgstr ""
+msgstr "截止日期"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Top-Down Appraisal Requests"
-msgstr ""
+msgstr "要求自上而下的评价"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "General"
-msgstr ""
+msgstr "一般"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_employee:0
 msgid "Send all answers to the employee"
-msgstr ""
+msgstr "发送所有答案给员工"
 
 #. module: hr_evaluation
 #: field:hr.employee,evaluation_date:0
 msgid "Next Evaluation Date"
-msgstr ""
+msgstr "下一个考评日期"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -718,18 +738,18 @@ msgstr "完成"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Evaluation Plan Phases"
-msgstr ""
+msgstr "考评计划阶段"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 #: view:hr_evaluation.evaluation:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "In Progress"
-msgstr ""
+msgstr "进行中"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
@@ -737,85 +757,85 @@ msgid ""
 "Interview Requests are generated automatically by OpenERP according to an "
 "employee's evaluation plan. Each user receives automatic emails and requests "
 "to evaluate their colleagues periodically."
-msgstr ""
+msgstr "根据员工的考评计划系统自动产生面谈要求。用户和考评要求到的同事自动接收邮件。"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 #: field:hr_evaluation.plan,phase_ids:0
 msgid "Evaluation Phases"
-msgstr ""
+msgstr "考评阶段"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Current"
-msgstr ""
+msgstr "当前的"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_interview
 msgid "Evaluation Interview"
-msgstr ""
+msgstr "考评面谈"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.reminder,evaluation_id:0
 msgid "Interview"
-msgstr ""
+msgstr "面谈"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_send_mail
 msgid "Evaluation Reminders"
-msgstr ""
+msgstr "考评提醒"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Self Appraisal Requests"
-msgstr ""
+msgstr "要求自我的评价"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,email_subject:0
 msgid "char"
-msgstr ""
+msgstr "字符"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,survey_request_ids:0
 msgid "Appraisal Forms"
-msgstr ""
+msgstr "评价表"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "内部备注"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Validate Evaluation"
-msgstr ""
+msgstr "确认考评"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Final Interview"
-msgstr ""
+msgstr "最后面谈"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,name:0
 msgid "Phase"
-msgstr ""
+msgstr "阶段"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Bottom-Up Appraisal Requests"
-msgstr ""
+msgstr "要求自下而上的评价"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Search Evaluation"
-msgstr ""
+msgstr "搜索考评"
 
 #. module: hr_evaluation
 #: field:hr.employee,evaluation_plan_id:0
@@ -824,76 +844,76 @@ msgstr ""
 #: field:hr_evaluation.plan.phase,plan_id:0
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan
 msgid "Evaluation Plan"
-msgstr ""
+msgstr "考评计划"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Send to Managers"
-msgstr ""
+msgstr "发给经理"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_send_mail
 msgid "Evaluation Send Mail"
-msgstr ""
+msgstr "发送邮件"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
 msgid "Employee Evaluation"
-msgstr "员工考核"
+msgstr "员工考评"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 msgid "Search Evaluation Plan"
-msgstr ""
+msgstr "搜索考评计划"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 msgid "(months)"
-msgstr ""
+msgstr "（月份）"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "序列"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(user_signature)s: User name"
-msgstr ""
+msgstr "(user_signature)s:用户名"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_interview_tree
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_hr_evaluation_interview_requests
 msgid "Interview Requests"
-msgstr ""
+msgstr "面谈要求"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: hr_evaluation
 #: help:hr.employee,evaluation_date:0
 msgid ""
 "The date of the next evaluation is computed by the evaluation plan's dates "
 "(first evaluation + periodicity)."
-msgstr ""
+msgstr "考评计划的下一个考评日期的计算方式（首个考评 + 周期）"
 
 #~ msgid "Score"
 #~ msgstr "评分"
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 58008578df3..bc585df7f67 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -7,7 +7,7 @@
         <field name="model">hr.evaluation.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree colors="blue:state in ('draft');black:state in ('wait','progress');gray:state in('done','cancel')"
+            <tree colors="blue:state == 'draft';black:state in ('wait','progress');gray:state in('done','cancel')"
              string="Evaluations Analysis">
                 <field name="create_date" invisible="1"/>
                 <field name="employee_id" invisible="1"/>
diff --git a/addons/hr_evaluation/wizard/__init__.py b/addons/hr_evaluation/wizard/__init__.py
index 1a855087bbc..64406ac6b1e 100644
--- a/addons/hr_evaluation/wizard/__init__.py
+++ b/addons/hr_evaluation/wizard/__init__.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
-import hr_evaluation_mail
+#import hr_evaluation_mail
+import mail_compose_message
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail.py b/addons/hr_evaluation/wizard/hr_evaluation_mail.py
index 17ad7415cb5..35c54a4cca3 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail.py
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail.py
@@ -23,21 +23,20 @@ import tools
 
 class hr_evaluation_reminder(osv.osv_memory):
     _name = "hr.evaluation.reminder"
-    _description = "Sends Reminders to employess to fill the evaluations"
+    _description = "Sends Reminders to employees to fill the evaluations"
     _columns = {
         'evaluation_id': fields.many2one('hr.evaluation.interview', 'Interview', required=True)
     }
 
     def send_mail(self, cr, uid, ids, context=None):
+        mail_message = self.pool.get('mail.message')
         hr_evaluation_interview_obj = self.pool.get('hr.evaluation.interview')
         evaluation_data = self.read(cr, uid, ids, context=context)[0]
         current_interview = hr_evaluation_interview_obj.browse(cr, uid, evaluation_data.get('evaluation_id'))
         if current_interview.state == "waiting_answer" and current_interview.user_to_review_id.work_email :
             msg = " Hello %s, \n\n Kindly post your response for '%s' survey interview. \n\n Thanks,"  %(current_interview.user_to_review_id.name, current_interview.survey_id.title)
-            tools.email_send(tools.config['email_from'], [current_interview.user_to_review_id.work_email],\
-                                          'Reminder to fill up Survey', msg)
+            mail_message.schedule_with_attach(cr, uid, tools.config['email_from'], [current_interview.user_to_review_id.work_email],\
+                                          'Reminder to fill up Survey', msg, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-hr_evaluation_reminder()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_evaluation/wizard/mail_compose_message.py b/addons/hr_evaluation/wizard/mail_compose_message.py
new file mode 100644
index 00000000000..7b4c1b69164
--- /dev/null
+++ b/addons/hr_evaluation/wizard/mail_compose_message.py
@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+import tools
+from tools.translate import _
+
+class mail_compose_message(osv.osv_memory):
+    _inherit = 'mail.compose.message'
+
+    def get_value(self, cr, uid, model, resource_id, context=None):
+        '''
+        To get values of the resource_id for the model
+        @param model: Object
+        @param resource_id: id of a record for which values to be read
+
+        @return: Returns a dictionary
+        '''
+        if context is None:
+            context = {}
+        result = super(mail_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
+        if model == 'hr.evaluation.interview' and resource_id:
+            model_pool = self.pool.get(model)
+            record_data = model_pool.browse(cr, uid, resource_id, context)
+            if record_data.state == "waiting_answer":
+                msg = _("Hello %s, \n\n Kindly post your response for '%s' survey interview. \n\n Thanks,")  %(record_data.user_to_review_id.name, record_data.survey_id.title)
+                result.update({
+                        'email_from': tools.config.get('email_from',''),
+                        'email_to': record_data.user_to_review_id.work_email or False,
+                        'subject': _("Reminder to fill up Survey"),
+                        'body_text': msg,
+                        'res_id': resource_id,
+                        'model': model,
+                        'email_cc': False,
+                        'email_bcc': False,
+                        'reply_to': False,
+                    })
+        return result
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: