[MERGE] merged with main addons

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

40 files changed, 472 insertions, 405 deletions

diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py
index 9a1713b9014..9b2f4c4e046 100644
--- a/addons/project_scrum/__openerp__.py
+++ b/addons/project_scrum/__openerp__.py
@@ -50,7 +50,7 @@ More information on the methodology:
     """,
     'author': 'OpenERP SA',
     'images': ['images/product_backlogs.jpeg', 'images/project_sprints.jpeg', 'images/scrum_dashboard.jpeg', 'images/scrum_meetings.jpeg'],
-    'depends': ['project', 'process'],
+    'depends': ['project', 'process', 'mail'],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
@@ -58,7 +58,7 @@ More information on the methodology:
         'wizard/project_scrum_backlog_create_task_view.xml',
         'wizard/project_scrum_backlog_merger_view.xml',
         'wizard/project_scrum_postpone_view.xml',
-        "wizard/project_scrum_email_view.xml",
+#        "wizard/project_scrum_email_view.xml",
         'project_scrum_view.xml',
         'wizard/project_scrum_backlog_sprint_view.xml',
         'process/project_scrum_process.xml',
diff --git a/addons/project_scrum/i18n/ar.po b/addons/project_scrum/i18n/ar.po
index acfd53b6b55..bf84ee26ae8 100644
--- a/addons/project_scrum/i18n/ar.po
+++ b/addons/project_scrum/i18n/ar.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-06-19 04:36+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -111,7 +111,7 @@ msgstr "مستوي التقدم"
 #: view:project.scrum.sprint:0
 #: field:project.scrum.sprint,scrum_master_id:0
 msgid "Scrum Master"
-msgstr ""
+msgstr "Scrum Master"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:83
@@ -191,7 +191,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.sprint,name:0
 msgid "Sprint Name"
-msgstr ""
+msgstr "اسم المهمة الأسبوعية (Sprint)"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_task
@@ -259,7 +259,7 @@ msgstr "سجل تراكمي للمنتج"
 #: view:project.scrum.sprint:0
 #: field:project.scrum.sprint,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "مشروع"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -282,12 +282,12 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Sprint Info"
-msgstr ""
+msgstr "بيان مهمة أسبوعية"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,date_stop:0
 msgid "Ending Date"
-msgstr ""
+msgstr "تاريخ انتهاء"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
@@ -298,7 +298,7 @@ msgstr ""
 #. module: project_scrum
 #: help:project.scrum.sprint,effective_hours:0
 msgid "Computed using the sum of the task work done."
-msgstr ""
+msgstr "محسوب باستخدام مجموع مهام الأعمال المنتهية."
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:91
@@ -319,7 +319,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.sprint,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "تاريخ الإبتداء"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:94
@@ -349,7 +349,7 @@ msgstr ""
 #: field:project.scrum.product.backlog,expected_hours:0
 #: field:project.scrum.sprint,expected_hours:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "الساعات المخططة"
 
 #. module: project_scrum
 #: field:project.scrum.email,subject:0
@@ -393,17 +393,17 @@ msgstr ""
 #: view:project.scrum.sprint:0
 #: field:project.scrum.sprint,state:0
 msgid "State"
-msgstr ""
+msgstr "حالة"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
-msgstr ""
+msgstr "عرض المهام الأسبوعية (Sprint)"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,meeting_ids:0
 msgid "Daily Scrum"
-msgstr ""
+msgstr "Scrum يومي"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.create.task:0
@@ -440,19 +440,19 @@ msgstr ""
 #. module: project_scrum
 #: model:ir.ui.menu,name:project_scrum.menu_scrum
 msgid "Scrum"
-msgstr ""
+msgstr "Scrum"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,question_today:0
 msgid "Tasks for today"
-msgstr ""
+msgstr "مهام اليوم"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:88
 #: field:project.scrum.meeting,question_yesterday:0
 #, python-format
 msgid "Tasks since yesterday"
-msgstr ""
+msgstr "مهام منذ أمس"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
@@ -490,12 +490,12 @@ msgstr ""
 #: selection:project.scrum.product.backlog,state:0
 #: selection:project.scrum.sprint,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "أُلغيت"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.dblc_proj2
 msgid "View project's tasks"
-msgstr ""
+msgstr "عرض المهام للمشروع"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:56
@@ -513,7 +513,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.sprint,backlog_ids:0
 msgid "Sprint Backlog"
-msgstr ""
+msgstr "سجل تراكمي للمهام الأسبوعية"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -540,7 +540,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.meeting,date:0
 msgid "Meeting Date"
-msgstr ""
+msgstr "تاريخ الإجتماع"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
@@ -549,7 +549,7 @@ msgstr ""
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Tasks"
-msgstr ""
+msgstr "المهام"
 
 #. module: project_scrum
 #: field:project.scrum.email,product_owner_email:0
@@ -570,7 +570,7 @@ msgstr ""
 #: help:project.scrum.product.backlog,progress:0
 #: help:project.scrum.sprint,progress:0
 msgid "Computed as: Time Spent / Total Time."
-msgstr ""
+msgstr "حسابها كالتالي: الوقت المستغرق / الوقت الإجمالي."
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
@@ -581,7 +581,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.meeting,question_blocks:0
 msgid "Blocks encountered"
-msgstr ""
+msgstr "نقط العوائق"
 
 #. module: project_scrum
 #: help:project.scrum.backlog.assign.sprint,state_open:0
@@ -609,7 +609,7 @@ msgstr ""
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Scrum Sprint"
-msgstr ""
+msgstr "مهام أسبوعية للـ (Scrum Sprint)"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
@@ -619,23 +619,23 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Review"
-msgstr ""
+msgstr "مراجعه"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,retrospective:0
 msgid "Sprint Retrospective"
-msgstr ""
+msgstr "المهام الأسبوعية بأثر رجعي (Sprint)"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,note:0
 msgid "Note"
-msgstr ""
+msgstr "ملاحظة"
 
 #. module: project_scrum
 #: selection:project.scrum.product.backlog,state:0
 #: selection:project.scrum.sprint,state:0
 msgid "Draft"
-msgstr ""
+msgstr "مسودة"
 
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
@@ -662,7 +662,7 @@ msgstr ""
 #: view:project.scrum.sprint:0
 #: selection:project.scrum.sprint,state:0
 msgid "Pending"
-msgstr ""
+msgstr "معلّق"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
@@ -684,7 +684,7 @@ msgstr ""
 #: field:project.project,product_owner_id:0
 #: field:project.scrum.sprint,product_owner_id:0
 msgid "Product Owner"
-msgstr ""
+msgstr "مالك المنتج"
 
 #. module: project_scrum
 #: help:project.scrum.product.backlog,sequence:0
@@ -695,12 +695,12 @@ msgstr ""
 #: model:process.node,name:project_scrum.process_node_productbacklog0
 #: view:project.scrum.product.backlog:0
 msgid "Product backlog"
-msgstr ""
+msgstr "السجل التراكمي للمنتج"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_product_backlog
 msgid "Backlogs"
-msgstr ""
+msgstr "سجلات تراكمية"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:326
@@ -716,7 +716,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.product.backlog,active:0
 msgid "Active"
-msgstr ""
+msgstr "نشط"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_meeting_form
@@ -742,12 +742,12 @@ msgstr ""
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
-msgstr ""
+msgstr "عرض السجل التراكمي للمهام الأسبوعية"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,question_backlog:0
 msgid "Backlog Accurate"
-msgstr ""
+msgstr "سجل تراكمي دقيق"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
@@ -791,13 +791,13 @@ msgstr ""
 #: selection:project.scrum.product.backlog,state:0
 #: selection:project.scrum.sprint,state:0
 msgid "Done"
-msgstr ""
+msgstr "تم"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
 #: view:project.scrum.product.backlog:0
 msgid "Cancel"
-msgstr ""
+msgstr "إلغـاء"
 
 #. module: project_scrum
 #: view:postpone.wizard:0
@@ -812,13 +812,13 @@ msgstr ""
 #: view:project.scrum.sprint:0
 #: selection:project.scrum.sprint,state:0
 msgid "Open"
-msgstr ""
+msgstr "افتح"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 #: field:project.scrum.sprint,effective_hours:0
 msgid "Effective hours"
-msgstr ""
+msgstr "ساعات فعالة"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -828,7 +828,7 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "الساعات المتبقية"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
@@ -838,7 +838,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.product.backlog,name:0
 msgid "Feature"
-msgstr ""
+msgstr "السمات"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
@@ -870,13 +870,13 @@ msgstr ""
 #. module: project_scrum
 #: model:process.transition,name:project_scrum.process_transition_backlogtask0
 msgid "Backlog Task"
-msgstr ""
+msgstr "سجل تراكمي للمهمة"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Planned hours"
-msgstr ""
+msgstr "الساعات المخططة"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_project_scrum_email
@@ -885,7 +885,7 @@ msgstr ""
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Scrum Meeting"
-msgstr ""
+msgstr "مقابلات (Scrum Meeting)"
 
 #. module: project_scrum
 #: model:ir.actions.report.xml,name:project_scrum.report_scrum_sprint_burndown_chart
@@ -896,7 +896,7 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Daily Meetings"
-msgstr ""
+msgstr "لقاءات يومية"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
@@ -906,7 +906,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.project,sprint_size:0
 msgid "Sprint Days"
-msgstr ""
+msgstr "أيام المهام الأسبوعية (Sprint)"
 
 #. module: project_scrum
 #: help:project.scrum.email,product_owner_email:0
@@ -916,7 +916,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.sprint,progress:0
 msgid "Progress (0-100)"
-msgstr ""
+msgstr "التقدم (0-100)"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:324
@@ -956,7 +956,7 @@ msgstr ""
 #. module: project_scrum
 #: view:project.project:0
 msgid "Scrum Data"
-msgstr ""
+msgstr "بيانات Scrum"
 
 #. module: project_scrum
 #: field:project.project,scrum:0
@@ -971,7 +971,7 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.product.backlog,tasks_id:0
 msgid "Tasks Details"
-msgstr ""
+msgstr "تفاصيل المهام"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_postpone_wizard
@@ -1087,4 +1087,279 @@ msgstr ""
 #. module: project_scrum
 #: field:project.scrum.sprint,review:0
 msgid "Sprint Review"
-msgstr ""
+msgstr "مراجعة المهام الأسبوعية"
+
+#~ msgid "Template"
+#~ msgstr "قالب"
+
+#~ msgid "Project Members"
+#~ msgstr "أعضاء المشروع"
+
+#~ msgid "What have you accomplished since yesterday ?"
+#~ msgstr "ماذا أنجزت منذ البارحة؟"
+
+#~ msgid "Scrum Projects"
+#~ msgstr "مشاريع Scrum"
+
+#~ msgid "Subproject"
+#~ msgstr "مشروع فرعي"
+
+#~ msgid "Scrum Task"
+#~ msgstr "مهمة Scrum"
+
+#~ msgid "Importance"
+#~ msgstr "أهمية"
+
+#~ msgid "Notes"
+#~ msgstr "ملاحظات"
+
+#~ msgid "Very urgent"
+#~ msgstr "عاجل جداً"
+
+#~ msgid "Deadline"
+#~ msgstr "الموعد النهائي"
+
+#~ msgid "Mail Header"
+#~ msgstr "رأس البريد"
+
+#~ msgid "Team Name"
+#~ msgstr "اسم الفريق"
+
+#~ msgid "Priority"
+#~ msgstr "أولوية"
+
+#~ msgid "Type"
+#~ msgstr "نوع"
+
+#~ msgid "Medium"
+#~ msgstr "متوسط"
+
+#~ msgid "Task Details"
+#~ msgstr "تفاصيل المهمة"
+
+#~ msgid "Contact"
+#~ msgstr "جهة الإتصال"
+
+#~ msgid "Scrum Product backlog"
+#~ msgstr "سجل تراكمي للمنتج بطريقة Scrum"
+
+#~ msgid "Delay Hours"
+#~ msgstr "ساعات تأخير"
+
+#~ msgid "Optionnal Info"
+#~ msgstr "معلومات اختيارية"
+
+#~ msgid "Draft Backlogs"
+#~ msgstr "مسودة السجلات التراكمية"
+
+#~ msgid "Low"
+#~ msgstr "منخفض"
+
+#~ msgid "Is there anything blocking you ?"
+#~ msgstr "هل هناك أي شيء يعيقك؟"
+
+#~ msgid "Status"
+#~ msgstr "الحالة"
+
+#~ msgid "Project Manager"
+#~ msgstr "مدير المشروع"
+
+#~ msgid "Timebox"
+#~ msgstr "الوقت الزمني"
+
+#~ msgid "Project Name"
+#~ msgstr "اسم المشروع"
+
+#~ msgid "Assigned to"
+#~ msgstr "مكلف إلى"
+
+#~ msgid "Date Closed"
+#~ msgstr "تاريخ الإغلاق"
+
+#~ msgid "Delegated To"
+#~ msgstr "مفوض إلى"
+
+#~ msgid "Working Time"
+#~ msgstr "ساعات العمل"
+
+#~ msgid "Task summary"
+#~ msgstr "ملخص المهمة"
+
+#~ msgid "In Progress"
+#~ msgstr "قيد التقدم"
+
+#~ msgid "Very Low"
+#~ msgstr "منخفض جداً"
+
+#~ msgid "Timetable working hours to adjust the gantt diagram report"
+#~ msgstr "الجدول الزمني لساعات العمل لتعديل تقرير الرسم البياني Gantt"
+
+#~ msgid ""
+#~ "Total remaining time, can be re-estimated periodically by the assignee of "
+#~ "the task."
+#~ msgstr ""
+#~ "إجمالي الوقت المتبقي، يمكن إعادة تقدير من خلال الشخص المحال إليه المهمة."
+
+#~ msgid "Delegated Tasks"
+#~ msgstr "المهام المفوضة"
+
+#~ msgid "My tasks"
+#~ msgstr "مهامي"
+
+#~ msgid ""
+#~ "Header added at the beginning of the email for the warning message sent to "
+#~ "the customer when a task is closed."
+#~ msgstr ""
+#~ "يوضع تنبيه في أول البريد الإلكتروني كرسالة تحذير للعميل حين إنتهاء المهمة."
+
+#~ msgid ""
+#~ "Project's member. Not used in any computation, just for information purpose."
+#~ msgstr "أعضاء المشروع، غير مستخدمين لأي عمليات حسابية، فقط لأغراض معلوماتية."
+
+#~ msgid "My opened sprints (Product Owner)"
+#~ msgstr "المهام الأسبوعية المفتوحة (مالك المنتج)"
+
+#~ msgid ""
+#~ "If you check this field, the project manager will receive a request each "
+#~ "time a task is completed by his team."
+#~ msgstr ""
+#~ "اذا علمت هذا الحقل، سيستلم مدير المشروع طلب في كل مرة تكتمل فيها مهمة من قبل "
+#~ "أعضاء فريقه."
+
+#~ msgid ""
+#~ "Estimated time to do the task, usually set by the project manager when the "
+#~ "task is in draft state."
+#~ msgstr ""
+#~ "الوقت التقديري لإنجاز المهمة، يضعها في العادة مدير المشروع عندما تكون المهمة "
+#~ "في حالة المسودة."
+
+#~ msgid "All Tasks"
+#~ msgstr "جميع المهام"
+
+#~ msgid "Partner"
+#~ msgstr "شريك"
+
+#~ msgid "Total Time"
+#~ msgstr "إجمالي الوقت"
+
+#~ msgid "Computed as: Time Spent + Remaining Time."
+#~ msgstr "حسابها كالتالي: الوقت المستغرق + الوقت المتبقي"
+
+#~ msgid "Internal description of the project."
+#~ msgstr "وصف داخلي للمشروع."
+
+#~ msgid "Percent of tasks closed according to the total of tasks todo."
+#~ msgstr "نسبة المهام المغلقة وفقاً لمجموع المهام المطلوب تنفيذها."
+
+#~ msgid "Planned Time"
+#~ msgstr "الوقت المخطط"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "هناك خطأ في بيانات الـ XML للعرض!"
+
+#~ msgid "Projects"
+#~ msgstr "المشروعات"
+
+#~ msgid "Scrum Tasks"
+#~ msgstr "مهام Scrum"
+
+#~ msgid "Progress (%)"
+#~ msgstr "نسبة التقدم (%)"
+
+#~ msgid "Opened tasks"
+#~ msgstr "مهام المفتوحة"
+
+#~ msgid "Is Scrum"
+#~ msgstr "هل هو Scrum"
+
+#~ msgid "Create Tasks"
+#~ msgstr "إنشاء مهام"
+
+#~ msgid "My opened sprints (Scrum Master)"
+#~ msgstr "مهامي الأسبوعية المفتوحة (Scrum Master)"
+
+#~ msgid "My opened tasks"
+#~ msgstr "مهامي المفتوحة"
+
+#~ msgid "Sum of total hours of all tasks related to this project."
+#~ msgstr "المجموع الكلي للساعات لكل المهام المتعلقة بهذا المشروع."
+
+#~ msgid "Opened Sprints"
+#~ msgstr "مهام مفتوحة"
+
+#~ msgid "My Sprints (Scrum Master)"
+#~ msgstr "مهامي الأسبوعية (Scrum Master)"
+
+#~ msgid "Time Spent"
+#~ msgstr "الوقت المستغرق"
+
+#~ msgid "Work done"
+#~ msgstr "العمل إنتهي"
+
+#~ msgid "User"
+#~ msgstr "مستخدِم"
+
+#~ msgid "Draft Sprints"
+#~ msgstr "مسودة المهام الأسبوعية"
+
+#~ msgid ""
+#~ "Computed as: Total Time - Estimated Time. It gives the difference of the "
+#~ "time estimated by the project manager and the real time to close the task."
+#~ msgstr ""
+#~ "حسابها كالتالي: الوقت الكلي - الوقت التقديري، يعطي الفرق بين الوقت المقدر من "
+#~ "مدير المشروع والوقت الحقيقي لإغلاق المهمة."
+
+#~ msgid "Warn Partner"
+#~ msgstr "أخبر شريك"
+
+#~ msgid "My Sprints (Product Owner)"
+#~ msgstr "مهامي الأسبوعية (مالك المنتج)"
+
+#~ msgid "Sum of spent hours of all tasks related to this project."
+#~ msgstr "مجموع الساعات المستهلكة لكل المهام المرتبطة بهذا المشروع."
+
+#~ msgid "Sum of planned hours of all tasks related to this project."
+#~ msgstr "مجموع الساعات المخططة لكل المهام المرتبطة بهذا المشروع."
+
+#~ msgid "Parent Task"
+#~ msgstr "المهمة الأم"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "اسم الكائن يجب أن يبدأ ب \"_x\" ولا يحتوي على رموز خاصة !"
+
+#~ msgid "Warn Manager"
+#~ msgstr "تحذير المدير"
+
+#~ msgid "Urgent"
+#~ msgstr "عاجل"
+
+#~ msgid "Sprints Done"
+#~ msgstr "المهام الأسبوعية المنتهية"
+
+#~ msgid "Description"
+#~ msgstr "وصف"
+
+#~ msgid "Edit Projects"
+#~ msgstr "تحرير المشروعات"
+
+#~ msgid "Analytic Account"
+#~ msgstr "حسابات تحليلية"
+
+#~ msgid "Hours Spent"
+#~ msgstr "الوقت المستغرق"
+
+#~ msgid "Running"
+#~ msgstr "قيد التنفيذ"
+
+#~ msgid "Scrum Project"
+#~ msgstr "مشروع Scrum"
+
+#~ msgid "Parent project"
+#~ msgstr "مشروع رئيسي"
+
+#~ msgid "What are you working on today ?"
+#~ msgstr "ماذا ستعمل اليوم؟"
+
+#~ msgid "Scrum Team"
+#~ msgstr "فريق Scrum"
diff --git a/addons/project_scrum/i18n/bg.po b/addons/project_scrum/i18n/bg.po
index fa259a7e8f2..012bc2c96f4 100644
--- a/addons/project_scrum/i18n/bg.po
+++ b/addons/project_scrum/i18n/bg.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 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/bs.po b/addons/project_scrum/i18n/bs.po
index 4e833742289..f93ed3fefe5 100644
--- a/addons/project_scrum/i18n/bs.po
+++ b/addons/project_scrum/i18n/bs.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 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/ca.po b/addons/project_scrum/i18n/ca.po
index a4a6b79d00f..1203d8bf11b 100644
--- a/addons/project_scrum/i18n/ca.po
+++ b/addons/project_scrum/i18n/ca.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-08-23 05:04+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/cs.po b/addons/project_scrum/i18n/cs.po
index a330261531b..6e076cc260d 100644
--- a/addons/project_scrum/i18n/cs.po
+++ b/addons/project_scrum/i18n/cs.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 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/de.po b/addons/project_scrum/i18n/de.po
index 761d103d5c7..31fe5871c9c 100644
--- a/addons/project_scrum/i18n/de.po
+++ b/addons/project_scrum/i18n/de.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 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -1495,138 +1495,5 @@ msgstr "Sprint Rückbetrachtung"
 #~ msgid "Delegated To"
 #~ msgstr "Delegiert an"
 
-#~ msgid "Editable"
-#~ msgstr "Bearbeitbar"
-
-#~ msgid "Error! task start-date must be lower then task end-date."
-#~ msgstr "Fehler! Das Anfangsdatum muss kleiner als das Enddatum sein."
-
-#~ msgid "Owners"
-#~ msgstr "Eigentümer"
-
-#~ msgid "Extended Options..."
-#~ msgstr "Erweiterte Optionen.."
-
-#~ msgid "Error! You can not create recursive analytic accounts."
-#~ msgstr "Fehler! Es können keine rekursive Kontenhierarchien erstellt werden."
-
-#~ msgid "Hello"
-#~ msgstr "Hallo"
-
-#~ msgid "Set Open"
-#~ msgstr "Setze auf Offen"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#, python-format
-#~ msgid ""
-#~ "is converted into Task %d.\"%(task_id,))\n"
-#~ "                self.log(cr, uid, backlog.id, message)\n"
-#~ "            if data['state_open'] and backlog.state == \"draft\":\n"
-#~ "                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-#~ "            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-#~ "context=context)\n"
-#~ "            message = _('Product Backlog"
-#~ msgstr ""
-#~ "wurde konvertiert in Aufgabe %d.\"%(task_id,))\n"
-#~ "                self.log(cr, uid, backlog.id, message)\n"
-#~ "            if data['state_open'] and backlog.state == \"draft\":\n"
-#~ "                backlog_obj.write(cr, uid, backlog.id, {'state':'open'})\n"
-#~ "            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], "
-#~ "context=context)\n"
-#~ "            message = _('Product Backlog"
-
-#, python-format
-#~ msgid "*Blocks encountered:"
-#~ msgstr "* Hindernisse für Weiterarbeit:"
-
-#, python-format
-#~ msgid "Scrum Meeting of"
-#~ msgstr "Scrum Meeting für"
-
-#, python-format
-#~ msgid "for the Sprint"
-#~ msgstr "für den Sprint"
-
-#, python-format
-#~ msgid "Hello "
-#~ msgstr "Hallo "
-
-#, python-format
-#~ msgid "*Tasks since yesterday:"
-#~ msgstr "*Aufgaben seit gestern:"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#, python-format
-#~ msgid "No Blocks"
-#~ msgstr "Keine Hindernisse"
-
-#, python-format
-#~ msgid ""
-#~ " Email Not send to the product owner %s!' % "
-#~ "meeting_id.sprint_id.product_owner_id.name))\n"
-#~ "        else:\n"
-#~ "            raise osv.except_osv(_('Error !"
-#~ msgstr ""
-#~ " Email wurde nicht gesendet an den Product Owner  %s!' % "
-#~ "meeting_id.sprint_id.product_owner_id.name))\n"
-#~ "        else:\n"
-#~ "            raise osv.except_osv(_('Error !"
-
-#, python-format
-#~ msgid ""
-#~ " Email Not send to the scrum master %s!' % "
-#~ "meeting_id.sprint_id.scrum_master_id.name))\n"
-#~ "        else:\n"
-#~ "            raise osv.except_osv(_('Error !"
-#~ msgstr ""
-#~ " Email wurde nicht gesendet an den Scrum Master %s!' % "
-#~ "meeting_id.sprint_id.scrum_master_id.name))\n"
-#~ "        else:\n"
-#~ "            raise osv.except_osv(_('Error !"
-
-#, python-format
-#~ msgid "I am sending you Daily Meeting Details of date"
-#~ msgstr "Ich sende Dir das Tagesprotokoll zum Meeting vom"
-
-#, python-format
-#~ msgid "*Task for Today:"
-#~ msgstr "* Heutige Aufgaben:"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid ""
-#~ "The scrum agile methodology is used in software development projects. In "
-#~ "this methodology, a sprint is a short period of time (one month) on which "
-#~ "the team implement a list of product backlogs. The sprint review is "
-#~ "organized when the team presents his work to the customer and product owner."
-#~ msgstr ""
-#~ "Die Scrum Methodik wird in Softwareentwicklungsprojekten eingesetzt. Bei "
-#~ "dieser Methode repräsentiert ein Sprint einen genau definierten kurzen "
-#~ "Zeitabschnitt (ein Monat) für den ein Projektteam eine vereinbarte Liste an "
-#~ "Produkt Backlogs umsetzt. Der Sprint Review soll dann kurzfristig eine "
-#~ "kritische Rückbetrachtung auf das Projekt bei der Ergebnispräsentation "
-#~ "gegenüber dem Kunden oder dem Produkt Owner ermöglichen."
-
-#~ msgid ""
-#~ "The scrum agile methodology is used in software development projects. The "
-#~ "Product Backlog is the list of features to be implemented. A product backlog "
-#~ "can be planified in a sprint of developement and can be split into several "
-#~ "tasks. The product backlog is managed by the product owner of the project."
-#~ msgstr ""
-#~ "Die Scrum Methodik wird in Softwareentwicklungsprojekten eingesetzt. Das "
-#~ "Produkt Backlog repräsentiert eine Liste an Funktionen die es zu "
-#~ "implementieren gilt. Ein Produkt Backlog kann planerisch in einen Sprint "
-#~ "umgesetzt werden und dabei in eine Liste diverser Aufgaben zerlegt werden. "
-#~ "Das Produkt Backlog wird durch den Produkt Owner für dieses Projekt "
-#~ "verwaltet."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/project_scrum/i18n/el.po b/addons/project_scrum/i18n/el.po
index bf8ab0d3b9e..4fd367aa63d 100644
--- a/addons/project_scrum/i18n/el.po
+++ b/addons/project_scrum/i18n/el.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 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/es.po b/addons/project_scrum/i18n/es.po
index 0e7833b6298..8f32f5148e0 100644
--- a/addons/project_scrum/i18n/es.po
+++ b/addons/project_scrum/i18n/es.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 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -1484,31 +1484,3 @@ msgstr "Revisión del sprint"
 #~ "financiera de los proyectos. Le permite conectar los proyectos con "
 #~ "presupuestos, planificación, análisis de costes e ingresos, tiempo dedicado "
 #~ "en los proyectos, etc."
-
-#, python-format
-#~ msgid "*Blocks encountered:"
-#~ msgstr "*Bloqueos encontrados:"
-
-#, python-format
-#~ msgid "for the Sprint"
-#~ msgstr "por el sprint"
-
-#, python-format
-#~ msgid "Hello "
-#~ msgstr "Hola "
-
-#, python-format
-#~ msgid "No Blocks"
-#~ msgstr "Sin bloqueos"
-
-#, python-format
-#~ msgid "*Task for Today:"
-#~ msgstr "*Tarea para hoy:"
-
-#, python-format
-#~ msgid "*Tasks since yesterday:"
-#~ msgstr "*Tareas desde ayer:"
-
-#, python-format
-#~ msgid "I am sending you Daily Meeting Details of date"
-#~ msgstr "Le envío los detalles de la reunión diaria de fecha"
diff --git a/addons/project_scrum/i18n/es_AR.po b/addons/project_scrum/i18n/es_AR.po
index e94b55dbd39..9f3d4986808 100644
--- a/addons/project_scrum/i18n/es_AR.po
+++ b/addons/project_scrum/i18n/es_AR.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 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/et.po b/addons/project_scrum/i18n/et.po
index cada072d522..0a0f30f1dbc 100644
--- a/addons/project_scrum/i18n/et.po
+++ b/addons/project_scrum/i18n/et.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 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -1417,12 +1417,3 @@ msgstr "Sprindi ülevaade"
 
 #~ msgid "Running"
 #~ msgstr "Töös"
-
-#~ msgid "Editable"
-#~ msgstr "Redigeeritav"
-
-#~ msgid "Error! You can not create recursive analytic accounts."
-#~ msgstr "Viga! Sa ei saa luua rekursiivseid analüütilisi kontosid."
-
-#~ msgid "Hello"
-#~ msgstr "Tere"
diff --git a/addons/project_scrum/i18n/fr.po b/addons/project_scrum/i18n/fr.po
index e75844700af..adca710673b 100644
--- a/addons/project_scrum/i18n/fr.po
+++ b/addons/project_scrum/i18n/fr.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 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -1441,31 +1441,3 @@ msgstr "Revue de Sprint"
 
 #~ msgid "Sum of planned hours of all tasks related to this project."
 #~ msgstr "Somme des tâches planifiés de toutes les tâches relier à ce projet."
-
-#, python-format
-#~ msgid "*Tasks since yesterday:"
-#~ msgstr "*Tâches depuis hier :"
-
-#, python-format
-#~ msgid "for the Sprint"
-#~ msgstr "pour le sprint"
-
-#, python-format
-#~ msgid "Hello "
-#~ msgstr "Bonjour "
-
-#, python-format
-#~ msgid "*Blocks encountered:"
-#~ msgstr "* Blocages rencontrés :"
-
-#, python-format
-#~ msgid "No Blocks"
-#~ msgstr "Nb de blocs"
-
-#, python-format
-#~ msgid "I am sending you Daily Meeting Details of date"
-#~ msgstr "Je vous envoie les détails de la mêlée quotidienne de la date"
-
-#, python-format
-#~ msgid "*Task for Today:"
-#~ msgstr "*Tâche pour aujourd'hui :"
diff --git a/addons/project_scrum/i18n/gu.po b/addons/project_scrum/i18n/gu.po
index 1dceeb5ad25..bfdaf47abde 100644
--- a/addons/project_scrum/i18n/gu.po
+++ b/addons/project_scrum/i18n/gu.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 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/hr.po b/addons/project_scrum/i18n/hr.po
index 42407a95113..66182b29ec6 100644
--- a/addons/project_scrum/i18n/hr.po
+++ b/addons/project_scrum/i18n/hr.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 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/hu.po b/addons/project_scrum/i18n/hu.po
index 29132eb3795..61fa21ebf79 100644
--- a/addons/project_scrum/i18n/hu.po
+++ b/addons/project_scrum/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-01-26 14:04+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 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -1090,15 +1091,3 @@ msgstr ""
 #: field:project.scrum.sprint,review:0
 msgid "Sprint Review"
 msgstr ""
-
-#, python-format
-#~ msgid "Hello "
-#~ msgstr "Hello "
-
-#, python-format
-#~ msgid "*Tasks since yesterday:"
-#~ msgstr "*Feladatok tegnap óta:"
-
-#, python-format
-#~ msgid "*Task for Today:"
-#~ msgstr "*Mai feladatok:"
diff --git a/addons/project_scrum/i18n/id.po b/addons/project_scrum/i18n/id.po
index 406f879de46..4bc144d4a07 100644
--- a/addons/project_scrum/i18n/id.po
+++ b/addons/project_scrum/i18n/id.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 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/it.po b/addons/project_scrum/i18n/it.po
index b80e130d36a..0cd65bd8419 100644
--- a/addons/project_scrum/i18n/it.po
+++ b/addons/project_scrum/i18n/it.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 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -1270,7 +1270,3 @@ msgstr "Revisione Sprint"
 
 #~ msgid "Created tasks"
 #~ msgstr "Attività Create"
-
-#, python-format
-#~ msgid "Hello "
-#~ msgstr "Salve "
diff --git a/addons/project_scrum/i18n/ko.po b/addons/project_scrum/i18n/ko.po
index 01149cf560b..daf089c6cb3 100644
--- a/addons/project_scrum/i18n/ko.po
+++ b/addons/project_scrum/i18n/ko.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 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/lt.po b/addons/project_scrum/i18n/lt.po
index 42407a95113..66182b29ec6 100644
--- a/addons/project_scrum/i18n/lt.po
+++ b/addons/project_scrum/i18n/lt.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 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/nl.po b/addons/project_scrum/i18n/nl.po
index 9e3e1313699..41fa187eca5 100644
--- a/addons/project_scrum/i18n/nl.po
+++ b/addons/project_scrum/i18n/nl.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 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -1471,31 +1471,3 @@ msgstr "Sprint evaluatie"
 #~ msgstr ""
 #~ "Voetregels die worden toegevoegd aan het emailbericht waarmee de klant wordt "
 #~ "gewaarschuwd als een taak wordt afgesloten."
-
-#, python-format
-#~ msgid "*Blocks encountered:"
-#~ msgstr "*Blokkades ontdekt:"
-
-#, python-format
-#~ msgid "for the Sprint"
-#~ msgstr "voor de Sprint"
-
-#, python-format
-#~ msgid "Hello "
-#~ msgstr "Hallo "
-
-#, python-format
-#~ msgid "*Tasks since yesterday:"
-#~ msgstr "*Taken sinds gisteren:"
-
-#, python-format
-#~ msgid "No Blocks"
-#~ msgstr "Geeb blokkades"
-
-#, python-format
-#~ msgid "I am sending you Daily Meeting Details of date"
-#~ msgstr "Ik stuur u de dagelijkse vergadering details van datum"
-
-#, python-format
-#~ msgid "*Task for Today:"
-#~ msgstr "*Taak voor vandaag:"
diff --git a/addons/project_scrum/i18n/nl_BE.po b/addons/project_scrum/i18n/nl_BE.po
index 77608115a8a..2aa0213f5e0 100644
--- a/addons/project_scrum/i18n/nl_BE.po
+++ b/addons/project_scrum/i18n/nl_BE.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 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/pl.po b/addons/project_scrum/i18n/pl.po
index 1b84fb87b27..101d20d95de 100644
--- a/addons/project_scrum/i18n/pl.po
+++ b/addons/project_scrum/i18n/pl.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 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -1314,15 +1314,9 @@ msgstr "Przegląd sprintu"
 #~ "Czas pozostały. Może być okresowo przeszacowany przez osobę przypisaną do "
 #~ "zadania."
 
-#~ msgid "Editable"
-#~ msgstr "Edytowalne"
-
 #~ msgid "What have you accomplished since yesterday ?"
 #~ msgstr "Co osiągnąłeś od wczoraj ?"
 
-#~ msgid "Owners"
-#~ msgstr "Właściciele"
-
 #~ msgid "Mail Header"
 #~ msgstr "Magłówek wiadomości"
 
@@ -1346,9 +1340,6 @@ msgstr "Przegląd sprintu"
 #~ msgid "Computed as: Time Spent + Remaining Time."
 #~ msgstr "Obliczone jako: Czas spędzony + Czas pozostały"
 
-#~ msgid "Error! You can not create recursive analytic accounts."
-#~ msgstr "Błąd! Nie możesz tworzyć rekurencyjnych kont analitycznych"
-
 #~ msgid "Delay Hours"
 #~ msgstr "Opóźnienie"
 
@@ -1370,9 +1361,6 @@ msgstr "Przegląd sprintu"
 #~ msgid "Sum of planned hours of all tasks related to this project."
 #~ msgstr "Suma planowanych godzin dla wszystkich zadań projektu."
 
-#~ msgid "Set Open"
-#~ msgstr "Ustaw na otwarte"
-
 #~ msgid "Task summary"
 #~ msgstr "Podsumowanie zadania"
 
@@ -1382,10 +1370,3 @@ msgstr "Przegląd sprintu"
 #~ msgstr ""
 #~ "Nagłówek dodawany na początek wiadomości informującej klienta o zamknięciu "
 #~ "zadania."
-
-#, python-format
-#~ msgid "I am sending you Daily Meeting Details of date"
-#~ msgstr "Wysyłam Ci szczegóły codziennego spotkania z daty"
-
-#~ msgid "Hello"
-#~ msgstr "Witaj"
diff --git a/addons/project_scrum/i18n/pt.po b/addons/project_scrum/i18n/pt.po
index 240475d84b9..f49111c670d 100644
--- a/addons/project_scrum/i18n/pt.po
+++ b/addons/project_scrum/i18n/pt.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 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -1421,15 +1421,3 @@ msgstr "Rever Sprint"
 
 #~ msgid "Mail Footer"
 #~ msgstr "Rodapé do Mail"
-
-#, python-format
-#~ msgid "Hello "
-#~ msgstr "Olá "
-
-#, python-format
-#~ msgid "*Task for Today:"
-#~ msgstr "*Tarefa do dia:"
-
-#, python-format
-#~ msgid "*Tasks since yesterday:"
-#~ msgstr "*Tarefas desde ontem:"
diff --git a/addons/project_scrum/i18n/pt_BR.po b/addons/project_scrum/i18n/pt_BR.po
index 43db6ff561a..e5bd82d8446 100644
--- a/addons/project_scrum/i18n/pt_BR.po
+++ b/addons/project_scrum/i18n/pt_BR.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 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/ro.po b/addons/project_scrum/i18n/ro.po
index 42407a95113..66182b29ec6 100644
--- a/addons/project_scrum/i18n/ro.po
+++ b/addons/project_scrum/i18n/ro.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 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/ru.po b/addons/project_scrum/i18n/ru.po
index 6c8be6ef4d8..3d73e894aed 100644
--- a/addons/project_scrum/i18n/ru.po
+++ b/addons/project_scrum/i18n/ru.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 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/sl.po b/addons/project_scrum/i18n/sl.po
index c10bbc45aaa..cd44992fc73 100644
--- a/addons/project_scrum/i18n/sl.po
+++ b/addons/project_scrum/i18n/sl.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 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/sq.po b/addons/project_scrum/i18n/sq.po
index 360ea401297..149d890a3f9 100644
--- a/addons/project_scrum/i18n/sq.po
+++ b/addons/project_scrum/i18n/sq.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 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/sv.po b/addons/project_scrum/i18n/sv.po
index 1e5b3c31010..725c80c51a1 100644
--- a/addons/project_scrum/i18n/sv.po
+++ b/addons/project_scrum/i18n/sv.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-08-03 04:37+0000\n"
-"X-Generator: Launchpad (build 13573)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
@@ -1123,7 +1123,3 @@ msgstr ""
 
 #~ msgid "Users"
 #~ msgstr "Användare"
-
-#, python-format
-#~ msgid "Hello "
-#~ msgstr "Hej "
diff --git a/addons/project_scrum/i18n/tlh.po b/addons/project_scrum/i18n/tlh.po
index 8d91d713666..2fc4c75ba5f 100644
--- a/addons/project_scrum/i18n/tlh.po
+++ b/addons/project_scrum/i18n/tlh.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 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/tr.po b/addons/project_scrum/i18n/tr.po
index 9f808b4ee79..702183c6f89 100644
--- a/addons/project_scrum/i18n/tr.po
+++ b/addons/project_scrum/i18n/tr.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 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/uk.po b/addons/project_scrum/i18n/uk.po
index 09fbd975e84..06d195687c2 100644
--- a/addons/project_scrum/i18n/uk.po
+++ b/addons/project_scrum/i18n/uk.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 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/vi.po b/addons/project_scrum/i18n/vi.po
index ccd8cb95bf6..99658eb53dc 100644
--- a/addons/project_scrum/i18n/vi.po
+++ b/addons/project_scrum/i18n/vi.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 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/zh_CN.po b/addons/project_scrum/i18n/zh_CN.po
index f4e74f6bedc..2b37a955021 100644
--- a/addons/project_scrum/i18n/zh_CN.po
+++ b/addons/project_scrum/i18n/zh_CN.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-08-23 05:04+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/i18n/zh_TW.po b/addons/project_scrum/i18n/zh_TW.po
index aefa0347025..62e55b4d6a9 100644
--- a/addons/project_scrum/i18n/zh_TW.po
+++ b/addons/project_scrum/i18n/zh_TW.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 04:54+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index 334a415982d..f0db98294e7 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -317,6 +317,7 @@ class project_scrum_meeting(osv.osv):
         return True
 
     def email_send(self, cr, uid, ids, email, context=None):
+        mail_message_obj = self.pool.get('mail.message')
         meeting_id = self.browse(cr, uid, ids, context=context)[0]
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         user_email = user.user_email or tools.config.get('email_from', False)
@@ -324,7 +325,7 @@ class project_scrum_meeting(osv.osv):
         body += _('\n* Tasks since yesterday:\n_______________________\n%s\n\n* Task for Today:\n_______________________ \n%s\n\n* Blocks encountered:\n_______________________ \n\n%s') %(meeting_id.question_yesterday,meeting_id.question_today, meeting_id.question_blocks or _('No Blocks'))
         body += _("\n\nThank you,\n%s") % user.name
         sub_name = meeting_id.name or _('Scrum Meeting of %s') % meeting_id.date
-        flag = tools.email_send(user_email , [email], sub_name, body, reply_to=None, openobject_id=str(meeting_id.id))
+        flag = mail_message_obj.schedule_with_attach(cr, uid, user_email , [email], sub_name, body, model='project.scrum.meeting', res_id=meeting_id.id, context=context)
         if not flag:
             return False
         return True
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index aa16a62c0b9..19d1bcc6b84 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -33,7 +33,7 @@
             <field name="model">project.scrum.product.backlog</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancel','done');blue:state in ('pending')" string="Product Backlog">
+                <tree colors="grey:state in ('cancel','done');blue:state == 'pending'" string="Product Backlog">
                     <field name="sequence"/>
                     <field name="name"/>
                     <field name="project_id"/>
@@ -302,7 +302,7 @@
                     </notebook>
                     <group col="8" colspan="4">
                         <field name="state" readonly="1"/>
-                        <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d" 
+                        <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d"
                         			string="Burndown Chart" type="action" icon="gtk-print"/>
                         <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
                         <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
@@ -396,7 +396,9 @@
                         <field name="date"/>
                         <field name="sprint_id" domain="[('state', '=', 'open')]"/>
                         <field name="user_id"/>
-                        <button name="%(action_project_scrum_email)d"  string="Send Email" type="action" icon="terp-mail-message-new" />
+                        <button name="%(mail.action_email_compose_message_wizard)d"
+                                string="Send Email" type="action" icon="terp-mail-message-new"
+                        />
                     </group>
                     <notebook colspan="4">
                         <page string="Scrum Meeting">
diff --git a/addons/project_scrum/wizard/__init__.py b/addons/project_scrum/wizard/__init__.py
index 4b5b0919574..fcba1742d75 100644
--- a/addons/project_scrum/wizard/__init__.py
+++ b/addons/project_scrum/wizard/__init__.py
@@ -23,7 +23,7 @@ import project_scrum_backlog_create_task
 import project_scrum_backlog_sprint
 import project_scrum_backlog_merger
 import project_scrum_postpone
-import project_scrum_email
+import mail_compose_message
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/project_scrum/wizard/mail_compose_message.py b/addons/project_scrum/wizard/mail_compose_message.py
new file mode 100644
index 00000000000..777ca03fa37
--- /dev/null
+++ b/addons/project_scrum/wizard/mail_compose_message.py
@@ -0,0 +1,65 @@
+# -*- 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
+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 == 'project.scrum.meeting' and resource_id:
+            meeting_pool = self.pool.get('project.scrum.meeting')
+            user_pool = self.pool.get('res.users')
+            meeting = meeting_pool.browse(cr, uid, resource_id, context=context)
+
+            sprint = meeting.sprint_id
+            user_data = user_pool.browse(cr, uid, uid, context=context)
+            result.update({'email_from': user_data.address_id and user_data.address_id.email or False})
+
+            if sprint.scrum_master_id and sprint.scrum_master_id.user_email:
+                result.update({'email_to': sprint.scrum_master_id.user_email})
+            if sprint.product_owner_id and sprint.product_owner_id.user_email:
+                result.update({'email_to': result.get('email_to',False) and result.get('email_to') + ',' +  sprint.product_owner_id.user_email or sprint.product_owner_id.user_email})
+
+            subject = _("Scrum Meeting : %s") %(meeting.date)
+            message = _("Hello  , \nI am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'") %(meeting.date, sprint.name, sprint.project_id.name)
+            result.update({
+                       'subject': subject,
+                       'body_text': message,
+                       'model': model,
+                       'res_id': resource_id
+                    })
+        return result
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_scrum/wizard/project_scrum_email.py b/addons/project_scrum/wizard/project_scrum_email.py
index f2e8dd79446..f1d5b6665f7 100644
--- a/addons/project_scrum/wizard/project_scrum_email.py
+++ b/addons/project_scrum/wizard/project_scrum_email.py
@@ -69,6 +69,7 @@ class project_scrum_email(osv.osv_memory):
         if context is None:
             context = {}
 
+        mail_message = self.pool.get('mail.message')
         active_id = context.get('active_id', False)
         scrum_meeting_pool = self.pool.get('project.scrum.meeting')
         user_pool = self.pool.get('res.users')
@@ -91,7 +92,7 @@ class project_scrum_email(osv.osv_memory):
         body += "\n%s\n" %_("Task for Today")
         body += "_______________________ \n"
         body += "\n%s\n" %(meeting.question_today or _('None'))
-        body += "\n%s\n" % _('Blocking points encountered:') 
+        body += "\n%s\n" % _('Blocking points encountered:')
         body += "_______________________ \n"
         body += "\n%s\n" %(meeting.question_blocks or _('None'))
         body += "\n%s\n%s" %(_('Thank you,'), user.name)
@@ -100,8 +101,7 @@ class project_scrum_email(osv.osv_memory):
         if data.scrum_master_email == data.product_owner_email:
             data.product_owner_email = False
         if data.scrum_master_email:
-            tools.email_send(user_email, [data.scrum_master_email], data.subject, body, reply_to=user_email)
+            mail_message.schedule_with_attach(cr, uid, user_email, [data.scrum_master_email], data.subject, body, reply_to=user_email, context=context)
         if data.product_owner_email:
-            tools.email_send(user_email, [data.product_owner_email], data.subject, body, reply_to=user_email)
+            mail_message.schedule_with_attach(cr, uid, user_email, [data.product_owner_email], data.subject, body, reply_to=user_email, context=context)
         return {'type': 'ir.actions.act_window_close'}
-project_scrum_email()